Backed out changesets e7c4304d45d7 and 75d3146ac0d3 (bug 970891) for Android reftest failures.
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 06 Mar 2014 11:00:26 -0500
changeset 189526 ff0e1abb0b06ff152ddc4e8f66f5d074b9a19add
parent 189525 0392348b76483b9a450f9941ac95469aed79dd8a
child 189527 73c710ddf3d83859a0523768b660b242b25d2900
push id3503
push userraliiev@mozilla.com
push dateMon, 28 Apr 2014 18:51:11 +0000
treeherdermozilla-beta@c95ac01e332e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs970891
milestone30.0a1
backs oute7c4304d45d7d5480a379e77b3ea9b465e771f95
75d3146ac0d36b528e371c42e2ae25a08102744d
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changesets e7c4304d45d7 and 75d3146ac0d3 (bug 970891) for Android reftest failures. CLOSED TREE
gfx/thebes/gfxFont.cpp
layout/reftests/text/reftest.list
layout/reftests/text/space-font-1-ref.html
layout/reftests/text/space-font-1.html
--- a/gfx/thebes/gfxFont.cpp
+++ b/gfx/thebes/gfxFont.cpp
@@ -4575,30 +4575,17 @@ gfxFontGroup::MakeSpaceTextRun(const Par
     gfxFont *font = GetFontAt(0);
     if (MOZ_UNLIKELY(GetStyle()->size == 0)) {
         // Short-circuit for size-0 fonts, as Windows and ATSUI can't handle
         // them, and always create at least size 1 fonts, i.e. they still
         // render something for size 0 fonts.
         textRun->AddGlyphRun(font, gfxTextRange::kFontGroup, 0, false);
     }
     else {
-        if (font->GetSpaceGlyph()) {
-            // Normally, the font has a cached space glyph, so we can avoid
-            // the cost of calling FindFontForChar.
-            textRun->SetSpaceGlyph(font, aParams->mContext, 0);
-        } else {
-            // In case the primary font doesn't have <space> (bug 970891),
-            // find one that does.
-            uint8_t matchType;
-            nsRefPtr<gfxFont> spaceFont =
-                FindFontForChar(' ', 0, MOZ_SCRIPT_LATIN, nullptr, &matchType);
-            if (spaceFont) {
-                textRun->SetSpaceGlyph(spaceFont, aParams->mContext, 0);
-            }
-        }
+        textRun->SetSpaceGlyph(font, aParams->mContext, 0);
     }
 
     // Note that the gfxGlyphExtents glyph bounds storage for the font will
     // always contain an entry for the font's space glyph, so we don't have
     // to call FetchGlyphExtents here.
     return textRun;
 }
 
--- a/layout/reftests/text/reftest.list
+++ b/layout/reftests/text/reftest.list
@@ -290,11 +290,8 @@ pref(layout.css.text-align-true-value.en
 # stray control chars should not be invisible, bug 909344
 != control-chars-01a.html control-chars-01-notref.html
 != control-chars-01b.html control-chars-01-notref.html
 != control-chars-01c.html control-chars-01-notref.html
 != control-chars-01d.html control-chars-01-notref.html
 != control-chars-02.html control-chars-02-notref.html
 == control-chars-03a.html control-chars-03-ref.html
 == control-chars-03b.html control-chars-03-ref.html
-
-# font fallback for <space> when not supported in the primary font family - bug 970891
-HTTP(..) == space-font-1.html space-font-1-ref.html
deleted file mode 100644
--- a/layout/reftests/text/space-font-1-ref.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <title>Bug 970891</title>
-  <style type="text/css">
-    @font-face {
-      font-family: "test";
-      src: url(../fonts/markA.ttf);
-    }
-    div {
-      font-family: test, monospace;
-      font-size: 16px;
-      line-height: 32px;
-    }
-    span {
-      font-family: monospace;
-    }
-  </style>
-</head>
-
-<body>
-  <div><b>A</b><span> </span><b>A</b><span> </span><i>A</i><span> </span><i>A</i></div>
-</body>
-
-</html>
deleted file mode 100644
--- a/layout/reftests/text/space-font-1.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <title>Bug 970891</title>
-  <style type="text/css">
-    @font-face {
-      font-family: "test";
-      src: url(../fonts/markA.ttf);
-    }
-    div {
-      font-family: test, monospace;
-      font-size: 16px;
-      line-height: 32px;
-    }
-  </style>
-</head>
-
-<body>
-  <!-- markA does not have a glyph for the <space> character,
-       so the spaces should fall back to 'monospace' -->
-  <div><b>A</b> <b>A</b> <i>A</i> <i>A</i></div>
-</body>
-
-</html>