Attachment 112802 Details for Bug 70390 – Patch

[patch] Patch

bug-70390-20111027182317.patch (text/plain), 2.40 KB, created by Arthur Hsu on 2011-10-27 18:23:21 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Arthur Hsu

Created: 2011-10-27 18:23:21 PDT

Size: 2.40 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 98675)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,15 @@
>+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 NOBODY (OOPS!).
>+
>+        * platform/graphics/chromium/FontChromiumWin.cpp:
>+        (WebCore::Font::drawGlyphs):
>+        * platform/graphics/skia/SkiaFontWin.cpp:
>+        (WebCore::paintSkiaText):
>+
> 2011-10-27  Dan Bernstein  <mitz@apple.com>
> 
>         Assertion failure (m_text) in RenderText::RenderText() at icanhascheezburger.com
>Index: Source/WebCore/platform/graphics/chromium/FontChromiumWin.cpp
>===================================================================
>--- Source/WebCore/platform/graphics/chromium/FontChromiumWin.cpp	(revision 98645)
>+++ Source/WebCore/platform/graphics/chromium/FontChromiumWin.cpp	(working copy)
>@@ -395,7 +395,6 @@ void Font::drawGlyphs(GraphicsContext* g
>         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.
>Index: Source/WebCore/platform/graphics/skia/SkiaFontWin.cpp
>===================================================================
>--- Source/WebCore/platform/graphics/skia/SkiaFontWin.cpp	(revision 98645)
>+++ Source/WebCore/platform/graphics/skia/SkiaFontWin.cpp	(working copy)
>@@ -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 @@ void paintSkiaText(GraphicsContext* cont
>     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;

Actions: View | Formatted Diff | Diff

Attachments on bug 70390: 111539 | 112423 | 112556 | 112599 | 112762 | 112768 | 112802