Title: [132620] trunk/Source/WebCore
Revision
132620
Author
[email protected]
Date
2012-10-26 04:40:16 -0700 (Fri, 26 Oct 2012)

Log Message

Unreviewed, rolling out r132589.
http://trac.webkit.org/changeset/132589
https://bugs.webkit.org/show_bug.cgi?id=100498

Breaks font-face layout tests (Requested by pfeldman on
#webkit).

Patch by Sheriff Bot <[email protected]> on 2012-10-26

* css/CSSFontFaceSource.cpp:
(WebCore::CSSFontFaceSource::getFontData):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (132619 => 132620)


--- trunk/Source/WebCore/ChangeLog	2012-10-26 11:39:36 UTC (rev 132619)
+++ trunk/Source/WebCore/ChangeLog	2012-10-26 11:40:16 UTC (rev 132620)
@@ -1,3 +1,15 @@
+2012-10-26  Sheriff Bot  <[email protected]>
+
+        Unreviewed, rolling out r132589.
+        http://trac.webkit.org/changeset/132589
+        https://bugs.webkit.org/show_bug.cgi?id=100498
+
+        Breaks font-face layout tests (Requested by pfeldman on
+        #webkit).
+
+        * css/CSSFontFaceSource.cpp:
+        (WebCore::CSSFontFaceSource::getFontData):
+
 2012-10-26  Takashi Sakamoto  <[email protected]>
 
         [Shadow DOM] Needs @host rule for ShadowDOM styling

Modified: trunk/Source/WebCore/css/CSSFontFaceSource.cpp (132619 => 132620)


--- trunk/Source/WebCore/css/CSSFontFaceSource.cpp	2012-10-26 11:39:36 UTC (rev 132619)
+++ trunk/Source/WebCore/css/CSSFontFaceSource.cpp	2012-10-26 11:40:16 UTC (rev 132620)
@@ -106,8 +106,7 @@
 #endif
     ) {
         // We're local. Just return a SimpleFontData from the normal cache.
-        // We don't want to check alternate font family names here, so pass true as the checkingAlternateName parameter.
-        return fontCache()->getCachedFontData(fontDescription, m_string, true);
+        return fontCache()->getCachedFontData(fontDescription, m_string);
     }
 
     // See if we have a mapping in our FontData cache.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to