Changeset 51605 in webkit

Timestamp:

Dec 2, 2009 11:17:46 AM (14 years ago)

Author:

eric@webkit.org

Message:

2009-12-02 Yusuke Sato <​yusukes@chromium.org>

Reviewed by Dan Bernstein.

Safari/Chromium for Windows fails to load CJK WebFonts
​https://bugs.webkit.org/show_bug.cgi?id=31804

• platform/graphics/opentype/OpenTypeUtilities.cpp: (WebCore::renameAndActivateFont): Load a remote font even if the font has 2 or more faces.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/opentype/OpenTypeUtilities.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-02  Yusuke Sato  <yusukes@chromium.org>
+
+        Reviewed by Dan Bernstein.
+
+        Safari/Chromium for Windows fails to load CJK WebFonts
+        https://bugs.webkit.org/show_bug.cgi?id=31804
+        
+        * platform/graphics/opentype/OpenTypeUtilities.cpp:
+        (WebCore::renameAndActivateFont): Load a remote font even if the font has 2 or more faces.
+
 2009-12-02  Avi Drissman  <avi@chromium.org>
 

trunk/WebCore/platform/graphics/opentype/OpenTypeUtilities.cpp

@@ -436 +436 @@
     HANDLE fontHandle = AddFontMemResourceEx(rewrittenFontData.data(), fontData->size() + nameTableSize, 0, &numFonts);
 
-    if (fontHandle && numFonts != 1) {
+    if (fontHandle && numFonts < 1) {
         RemoveFontMemResourceEx(fontHandle);
         return 0;