diff options
author | Steve Block <steveblock@google.com> | 2011-06-10 16:52:27 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-06-14 01:14:02 +0100 |
commit | 54cdeeebc7adcbcd900e8b6a141a8cae27d9a631 (patch) | |
tree | 845b0d338b204a48560eca3b51b34cf92ed96840 /Source/WebCore/platform/graphics/chromium/FontChromiumWin.cpp | |
parent | d2c5226a647dc21d0c15267e09a3d19cf3e0d593 (diff) | |
download | external_webkit-54cdeeebc7adcbcd900e8b6a141a8cae27d9a631.zip external_webkit-54cdeeebc7adcbcd900e8b6a141a8cae27d9a631.tar.gz external_webkit-54cdeeebc7adcbcd900e8b6a141a8cae27d9a631.tar.bz2 |
Merge WebKit at branches/chromium/742 r88085: Initial merge by git.
Change-Id: I0501b484b9528e31b0026e5ad64416dd6541cdde
Diffstat (limited to 'Source/WebCore/platform/graphics/chromium/FontChromiumWin.cpp')
-rw-r--r-- | Source/WebCore/platform/graphics/chromium/FontChromiumWin.cpp | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/Source/WebCore/platform/graphics/chromium/FontChromiumWin.cpp b/Source/WebCore/platform/graphics/chromium/FontChromiumWin.cpp index ac1e1af..5ca1414 100644 --- a/Source/WebCore/platform/graphics/chromium/FontChromiumWin.cpp +++ b/Source/WebCore/platform/graphics/chromium/FontChromiumWin.cpp @@ -454,25 +454,8 @@ void Font::drawGlyphs(GraphicsContext* graphicsContext, // Skip 100% transparent text; no need to draw anything. if (!alpha && graphicsContext->platformContext()->getStrokeStyle() == NoStroke && !graphicsContext->hasShadow()) return; - if (!alpha || windowsCanHandleDrawTextShadow(graphicsContext) || !windowsCanHandleTextDrawingWithoutShadow(graphicsContext)) { - drawGlyphsWin(graphicsContext, font, glyphBuffer, from, numGlyphs, point); - return; - } - // Draw in two passes: skia for the shadow, GDI for foreground text - // pass1: shadow (will use skia) - graphicsContext->save(); - graphicsContext->setFillColor(Color::transparent, graphicsContext->fillColorSpace()); - drawGlyphsWin(graphicsContext, font, glyphBuffer, from, numGlyphs, point); - graphicsContext->restore(); - // pass2: foreground text (will use GDI) - FloatSize shadowOffset; - float shadowBlur; - Color shadowColor; - ColorSpace shadowColorSpace; - graphicsContext->getShadow(shadowOffset, shadowBlur, shadowColor, shadowColorSpace); - graphicsContext->setShadow(shadowOffset, shadowBlur, Color::transparent, shadowColorSpace); + drawGlyphsWin(graphicsContext, font, glyphBuffer, from, numGlyphs, point); - graphicsContext->setShadow(shadowOffset, shadowBlur, shadowColor, shadowColorSpace); } FloatRect Font::selectionRectForComplexText(const TextRun& run, |