Changeset 98692 in webkit

Timestamp:

Oct 27, 2011, 10:37:32 PM (15 years ago)

Author:

commit-queue@webkit.org

Message:

Reland patch ensure font load before calling Skia during printing
​https://bugs.webkit.org/show_bug.cgi?id=70390

Patch by Arthur Hsu <​arthurhsu@chromium.org> on 2011-10-27
Reviewed by James Robinson.

• platform/graphics/chromium/FontChromiumWin.cpp:

(WebCore::Font::drawGlyphs):

• platform/graphics/skia/SkiaFontWin.cpp:

(WebCore::paintSkiaText):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/FontChromiumWin.cpp (modified) (1 diff)
• platform/graphics/skia/SkiaFontWin.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-27  Arthur Hsu  <arthurhsu@chromium.org>
+
+        Reland patch ensure font load before calling Skia during printing
+        https://bugs.webkit.org/show_bug.cgi?id=70390
+
+        Reviewed by James Robinson.
+
+        * platform/graphics/chromium/FontChromiumWin.cpp:
+        (WebCore::Font::drawGlyphs):
+        * platform/graphics/skia/SkiaFontWin.cpp:
+        (WebCore::paintSkiaText):
+
 2011-10-27  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/platform/graphics/chromium/FontChromiumWin.cpp

@@ -396 +396 @@
 
     HFONT hfont = font->platformData().hfont();
-    PlatformSupport::ensureFontLoaded(hfont);
 
     // We draw the glyphs in chunks to avoid having to do a heap allocation for

trunk/Source/WebCore/platform/graphics/skia/SkiaFontWin.cpp

@@ -34 +34 @@
 #include "AffineTransform.h"
 #include "PlatformContextSkia.h"
+#include "PlatformSupport.h"
 #include "Gradient.h"
 #include "Pattern.h"
 #include "SkCanvas.h"
+#include "SkDevice.h"
 #include "SkPaint.h"
 #include "SkShader.h"
@@ -237 +239 @@
     SkCanvas* canvas = platformContext->canvas();
     TextDrawingModeFlags textMode = platformContext->getTextDrawingMode();
+    // Ensure font load for printing, because PDF device needs it.
+    if (canvas->getTopDevice()->getDeviceCapabilities() & SkDevice::kVector_Capability)
+        PlatformSupport::ensureFontLoaded(hfont);
 
     // Filling (if necessary). This is the common case.