mozilla-central: changeset 298930:b59da510fb4ee028d01be2f56f8645787568e06a

author	Jonathan Kew <jkew@mozilla.com>
	Wed, 25 May 2016 10:36:46 +0100
changeset 298930	b59da510fb4ee028d01be2f56f8645787568e06a
parent 298929	5b615a565d65d9197dd4f1f7f08cba3b76fe03c9
child 298931	9935b7b2efb23187ff7ad0884bc412a8c9b78766
push id	30286
push user	kwierso@gmail.com
push date	Wed, 25 May 2016 22:33:39 +0000
treeherder	mozilla-central@1012461fa7bb [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
bugs	1273154
milestone	49.0a1
backs out	51b1f2343ad9544921e68859dfbe9d3c79b00951
first release with	nightly linux32 8d0aadfe7da7 / 49.0a1 / 20160526030223 / files nightly linux64 8d0aadfe7da7 / 49.0a1 / 20160526030223 / files nightly mac 8d0aadfe7da7 / 49.0a1 / 20160526030223 / files nightly win32 8d0aadfe7da7 / 49.0a1 / 20160526030223 / files nightly win64 8d0aadfe7da7 / 49.0a1 / 20160526030223 / files
last release without	nightly linux32 829d3be6ba64 / 49.0a1 / 20160524073714 / files nightly linux64 829d3be6ba64 / 49.0a1 / 20160524073714 / files nightly mac 829d3be6ba64 / 49.0a1 / 20160524073714 / files nightly win32 829d3be6ba64 / 49.0a1 / 20160524073714 / files nightly win64 829d3be6ba64 / 49.0a1 / 20160524073714 / files

--- a/gfx/thebes/gfxTextRun.cpp
+++ b/gfx/thebes/gfxTextRun.cpp
@@ -2632,47 +2632,27 @@ gfxFontGroup::GetUnderlineOffset()
     return mUnderlineOffset;
 }
 
 already_AddRefed<gfxFont>
 gfxFontGroup::FindFontForChar(uint32_t aCh, uint32_t aPrevCh, uint32_t aNextCh,
                               Script aRunScript, gfxFont *aPrevMatchedFont,
                               uint8_t *aMatchType)
 {
-    // If the char is a cluster extender, we want to use the same font as the
-    // preceding character if possible. This is preferable to using the font
-    // group because it avoids breaks in shaping within a cluster.
-    if (aPrevMatchedFont && IsClusterExtender(aCh) &&
+    // If the char is a cluster extender or NNBSP, we want to use the same
+    // font as the preceding character if possible. This is preferable to using
+    // the font group because it avoids breaks in shaping within a cluster.
+    const uint32_t NARROW_NO_BREAK_SPACE = 0x202f;
+    if (aPrevMatchedFont &&
+        (IsClusterExtender(aCh) || aCh == NARROW_NO_BREAK_SPACE) &&
         aPrevMatchedFont->HasCharacter(aCh)) {
         RefPtr<gfxFont> ret = aPrevMatchedFont;
         return ret.forget();
     }
 
-    // Special cases for NNBSP (as used in Mongolian):
-    const uint32_t NARROW_NO_BREAK_SPACE = 0x202f;
-    if (aCh == NARROW_NO_BREAK_SPACE) {
-        // If there is no preceding character, try the font that we'd use
-        // for the next char (unless it's just another NNBSP; we don't try
-        // to look ahead through a whole run of them).
-        if (!aPrevCh && aNextCh && aNextCh != NARROW_NO_BREAK_SPACE) {
-            RefPtr<gfxFont> nextFont =
-                FindFontForChar(aNextCh, 0, 0, aRunScript, aPrevMatchedFont,
-                                aMatchType);
-            if (nextFont->HasCharacter(aCh)) {
-                return nextFont.forget();
-            }
-        }
-        // Otherwise, treat NNBSP like a cluster extender (as above) and try
-        // to continue the preceding font run.
-        if (aPrevMatchedFont && aPrevMatchedFont->HasCharacter(aCh)) {
-            RefPtr<gfxFont> ret = aPrevMatchedFont;
-            return ret.forget();
-        }
-    }
-
     // To optimize common cases, try the first font in the font-group
     // before going into the more detailed checks below
     uint32_t nextIndex = 0;
     bool isJoinControl = gfxFontUtils::IsJoinControl(aCh);
     bool wasJoinCauser = gfxFontUtils::IsJoinCauser(aPrevCh);
     bool isVarSelector = gfxFontUtils::IsVarSelector(aCh);
 
     if (!isJoinControl && !wasJoinCauser && !isVarSelector) {

deleted file mode 100644
--- a/layout/reftests/bugs/1273154-2-ref.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <style>
-      body {
-        /* Force a large line-height so that we don't get a positioning
-           discrepancy on the test span depending on which font's metrics
-           are used in line-height computation. */
-        font: 64px/2 serif;
-      }
-      span {
-        font-family: "Mongolian Baiti", "Times New Roman", serif;
-        font-size: 32px;
-      }
-    </style>
-  </head>
-  <body>
-    <span>&#x202F;&#x1824;&#x1828;</span>
-  </body>
-</html>

deleted file mode 100644
--- a/layout/reftests/bugs/1273154-2.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <style>
-      body {
-        /* Force a large line-height so that we don't get a positioning
-           discrepancy on the test span depending on which font's metrics
-           are used in line-height computation. */
-        font: 64px/2 serif;
-      }
-      span {
-        /* Times does NOT support Mongolian characters, so the entire text
-           should be rendered as a single Mongolian Baiti run, including
-           the initial U+202F, even though it _is_ available in Times. */
-        font-family: "Times New Roman", "Mongolian Baiti", serif;
-        font-size: 32px;
-      }
-    </style>
-  </head>
-  <body>
-    <span>&#x202F;&#x1824;&#x1828;</span>
-  </body>
-</html>

--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -1949,10 +1949,9 @@ random-if(OSX==1006) == 1238243-2.html 1
 fuzzy(100,2000) == 1239564.html 1239564-ref.html
 == 1242172-1.html 1242172-1-ref.html
 == 1242172-2.html 1242172-2-ref.html
 == 1242781.html 1242781-ref.html
 == 1263845.html 1263845-ref.html
 == 1260543-1.html 1260543-1-ref.html
 == 1272997-1.html 1272997-1-ref.html
 random-if(!winWidget) == 1273154-1.html 1273154-1-ref.html # depends on Windows font
-random-if(!winWidget) == 1273154-2.html 1273154-2-ref.html # depends on Windows font
 == 1274368-1.html 1274368-1-ref.html

gfx/thebes/gfxTextRun.cpp		file \| annotate \| diff \| comparison \| revisions
layout/reftests/bugs/1273154-2-ref.html		file \| annotate \| diff \| comparison \| revisions
layout/reftests/bugs/1273154-2.html		file \| annotate \| diff \| comparison \| revisions
layout/reftests/bugs/reftest.list		file \| annotate \| diff \| comparison \| revisions