Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(291)

Unified Diff: Source/WebCore/platform/graphics/chromium/FontChromiumWin.cpp

Issue 6913001: Merge 85264 - 2011-04-28 Mike Reed <reed@google.com> (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/742/
Patch Set: Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/ChangeLog ('k') | Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/platform/graphics/chromium/FontChromiumWin.cpp
===================================================================
--- Source/WebCore/platform/graphics/chromium/FontChromiumWin.cpp (revision 85512)
+++ Source/WebCore/platform/graphics/chromium/FontChromiumWin.cpp (working copy)
@@ -454,25 +454,8 @@
// 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,
« no previous file with comments | « Source/WebCore/ChangeLog ('k') | Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698