Changeset 83329 in webkit

Timestamp:

Apr 8, 2011 1:08:01 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-08 Mike Reed <​reed@google.com>

Reviewed by Eric Seidel.

Replace SKIA_TEXT with isNativeFontRenderingAllowed() for print-preview to work
​https://bugs.webkit.org/show_bug.cgi?id=57782

No new tests. This change only affects print-preview and build option SKIA_GPU

• platform/graphics/skia/SkiaFontWin.cpp: (WebCore::paintSkiaText):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/skia/SkiaFontWin.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-08  Mike Reed  <reed@google.com>
+
+        Reviewed by Eric Seidel.
+
+        Replace SKIA_TEXT with isNativeFontRenderingAllowed() for print-preview to work
+        https://bugs.webkit.org/show_bug.cgi?id=57782
+
+        No new tests. This change only affects print-preview and build option SKIA_GPU 
+
+        * platform/graphics/skia/SkiaFontWin.cpp:
+        (WebCore::paintSkiaText):
+
 2011-04-08  Ryosuke Niwa  <rniwa@webkit.org>
 

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

@@ -378 +378 @@
         platformContext->setupPaintForStroking(&paint, 0, 0);
         paint.setFlags(SkPaint::kAntiAlias_Flag);
-#if ENABLE(SKIA_TEXT)
-        paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
-        setupPaintForFont(hfont, &paint);
-#endif
+        if (!platformContext->isNativeFontRenderingAllowed()) {
+            paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
+            setupPaintForFont(hfont, &paint);
+        }
 
         if (didFill) {