Title: [123262] trunk/Source/WebCore
Revision
123262
Author
[email protected]
Date
2012-07-20 14:27:00 -0700 (Fri, 20 Jul 2012)

Log Message

Typo in FontCacheWin.cpp causes return value from getCachedFontData() in getLastResortFallbackFont() to be ignored
https://bugs.webkit.org/show_bug.cgi?id=91506

Patch by Mark Salisbury <[email protected]> on 2012-07-20
Reviewed by Joseph Pecoraro.

No new test.  The "fallback fallback" code ends up creating a font, so you always
get a fallback font even with this code bug.  A test would be buggy, being highly
platform dependent on what the "fallback fallback" font is on the particular
windows machine the test runs on.

* platform/graphics/win/FontCacheWin.cpp:
(WebCore::FontCache::getLastResortFallbackFont):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (123261 => 123262)


--- trunk/Source/WebCore/ChangeLog	2012-07-20 21:24:20 UTC (rev 123261)
+++ trunk/Source/WebCore/ChangeLog	2012-07-20 21:27:00 UTC (rev 123262)
@@ -1,3 +1,18 @@
+2012-07-20  Mark Salisbury  <[email protected]>
+
+        Typo in FontCacheWin.cpp causes return value from getCachedFontData() in getLastResortFallbackFont() to be ignored
+        https://bugs.webkit.org/show_bug.cgi?id=91506
+
+        Reviewed by Joseph Pecoraro.
+
+        No new test.  The "fallback fallback" code ends up creating a font, so you always
+        get a fallback font even with this code bug.  A test would be buggy, being highly
+        platform dependent on what the "fallback fallback" font is on the particular
+        windows machine the test runs on.
+
+        * platform/graphics/win/FontCacheWin.cpp:
+        (WebCore::FontCache::getLastResortFallbackFont):
+
 2012-07-20  Stephen White  <[email protected]>
 
         [chromium] Clean up scratch texture usage in Chromium's implementation

Modified: trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp (123261 => 123262)


--- trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp	2012-07-20 21:24:20 UTC (rev 123261)
+++ trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp	2012-07-20 21:27:00 UTC (rev 123262)
@@ -331,7 +331,7 @@
     };
     SimpleFontData* simpleFont;
     for (size_t i = 0; i < WTF_ARRAY_LENGTH(fallbackFonts); ++i) {
-        if (simpleFont = getCachedFontData(fontDescription, fallbackFonts[i]), false, shouldRetain) {
+        if (simpleFont = getCachedFontData(fontDescription, fallbackFonts[i], false, shouldRetain)) {
             fallbackFontName = fallbackFonts[i];
             return simpleFont;
         }
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to