Title: [98692] trunk/Source/WebCore
- Revision
- 98692
- Author
- [email protected]
- Date
- 2011-10-27 22:37:32 -0700 (Thu, 27 Oct 2011)
Log Message
Reland patch ensure font load before calling Skia during printing
https://bugs.webkit.org/show_bug.cgi?id=70390
Patch by Arthur Hsu <[email protected]> on 2011-10-27
Reviewed by James Robinson.
* platform/graphics/chromium/FontChromiumWin.cpp:
(WebCore::Font::drawGlyphs):
* platform/graphics/skia/SkiaFontWin.cpp:
(WebCore::paintSkiaText):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (98691 => 98692)
--- trunk/Source/WebCore/ChangeLog 2011-10-28 05:22:35 UTC (rev 98691)
+++ trunk/Source/WebCore/ChangeLog 2011-10-28 05:37:32 UTC (rev 98692)
@@ -1,3 +1,15 @@
+2011-10-27 Arthur Hsu <[email protected]>
+
+ 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 <[email protected]>
Attempt to fix the Qt build.
Modified: trunk/Source/WebCore/platform/graphics/chromium/FontChromiumWin.cpp (98691 => 98692)
--- trunk/Source/WebCore/platform/graphics/chromium/FontChromiumWin.cpp 2011-10-28 05:22:35 UTC (rev 98691)
+++ trunk/Source/WebCore/platform/graphics/chromium/FontChromiumWin.cpp 2011-10-28 05:37:32 UTC (rev 98692)
@@ -395,7 +395,6 @@
return;
HFONT hfont = font->platformData().hfont();
- PlatformSupport::ensureFontLoaded(hfont);
// We draw the glyphs in chunks to avoid having to do a heap allocation for
// the arrays of characters and advances.
Modified: trunk/Source/WebCore/platform/graphics/skia/SkiaFontWin.cpp (98691 => 98692)
--- trunk/Source/WebCore/platform/graphics/skia/SkiaFontWin.cpp 2011-10-28 05:22:35 UTC (rev 98691)
+++ trunk/Source/WebCore/platform/graphics/skia/SkiaFontWin.cpp 2011-10-28 05:37:32 UTC (rev 98692)
@@ -33,9 +33,11 @@
#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"
#include "SkTemplates.h"
@@ -236,6 +238,9 @@
PlatformContextSkia* platformContext = context->platformContext();
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.
SkPaint paint;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
