Title: [98645] trunk/Source/WebCore
- Revision
- 98645
- Author
- [email protected]
- Date
- 2011-10-27 15:05:17 -0700 (Thu, 27 Oct 2011)
Log Message
Unreviewed, rolling out r98626.
http://trac.webkit.org/changeset/98626
https://bugs.webkit.org/show_bug.cgi?id=71066
Does not compile on cr-win (Requested by jamesr_ on #webkit).
Patch by Sheriff Bot <[email protected]> on 2011-10-27
* platform/graphics/chromium/FontChromiumWin.cpp:
(WebCore::Font::drawGlyphs):
* platform/graphics/skia/SkiaFontWin.cpp:
(WebCore::paintSkiaText):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (98644 => 98645)
--- trunk/Source/WebCore/ChangeLog 2011-10-27 21:56:57 UTC (rev 98644)
+++ trunk/Source/WebCore/ChangeLog 2011-10-27 22:05:17 UTC (rev 98645)
@@ -1,3 +1,16 @@
+2011-10-27 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r98626.
+ http://trac.webkit.org/changeset/98626
+ https://bugs.webkit.org/show_bug.cgi?id=71066
+
+ Does not compile on cr-win (Requested by jamesr_ on #webkit).
+
+ * platform/graphics/chromium/FontChromiumWin.cpp:
+ (WebCore::Font::drawGlyphs):
+ * platform/graphics/skia/SkiaFontWin.cpp:
+ (WebCore::paintSkiaText):
+
2011-10-27 Tony Chang <[email protected]>
Fix a compiler warning caught by gcc 4.6.1. Need to return something.
Modified: trunk/Source/WebCore/platform/graphics/chromium/FontChromiumWin.cpp (98644 => 98645)
--- trunk/Source/WebCore/platform/graphics/chromium/FontChromiumWin.cpp 2011-10-27 21:56:57 UTC (rev 98644)
+++ trunk/Source/WebCore/platform/graphics/chromium/FontChromiumWin.cpp 2011-10-27 22:05:17 UTC (rev 98645)
@@ -395,6 +395,7 @@
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 (98644 => 98645)
--- trunk/Source/WebCore/platform/graphics/skia/SkiaFontWin.cpp 2011-10-27 21:56:57 UTC (rev 98644)
+++ trunk/Source/WebCore/platform/graphics/skia/SkiaFontWin.cpp 2011-10-27 22:05:17 UTC (rev 98645)
@@ -35,7 +35,6 @@
#include "PlatformContextSkia.h"
#include "Gradient.h"
#include "Pattern.h"
-#include "PlatformSupport.h"
#include "SkCanvas.h"
#include "SkPaint.h"
#include "SkShader.h"
@@ -237,9 +236,6 @@
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
