diff options
| author | Ben Murdoch <benm@google.com> | 2010-08-11 14:44:44 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-08-12 19:15:41 +0100 |
| commit | dd8bb3de4f353a81954234999f1fea748aee2ea9 (patch) | |
| tree | 729b52bf09294f0d6c67cd5ea80aee1b727b7bd8 /WebCore/platform/graphics/skia/SkiaFontWin.cpp | |
| parent | f3d41ba51d86bf719c7a65ab5297aea3c17e2d98 (diff) | |
| download | external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.zip external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.tar.gz external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.tar.bz2 | |
Merge WebKit at r65072 : Initial merge by git.
Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
Diffstat (limited to 'WebCore/platform/graphics/skia/SkiaFontWin.cpp')
| -rw-r--r-- | WebCore/platform/graphics/skia/SkiaFontWin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/platform/graphics/skia/SkiaFontWin.cpp b/WebCore/platform/graphics/skia/SkiaFontWin.cpp index 6595f6b..44003bb 100644 --- a/WebCore/platform/graphics/skia/SkiaFontWin.cpp +++ b/WebCore/platform/graphics/skia/SkiaFontWin.cpp @@ -220,7 +220,7 @@ void SkiaWinOutlineCache::removePathsForFont(HFONT hfont) deleteOutline(outlineCache.find(*i)); } -bool windowsCanHandleDrawTextShadow(WebCore::GraphicsContext *context) +bool windowsCanHandleDrawTextShadow(GraphicsContext *context) { FloatSize shadowSize; float shadowBlur; @@ -323,7 +323,7 @@ bool paintSkiaText(GraphicsContext* context, } // Stroking on top (if necessary). - if ((textMode & WebCore::cTextStroke) + if ((textMode & cTextStroke) && platformContext->getStrokeStyle() != NoStroke && platformContext->getStrokeThickness() > 0) { |