Merge 85264 - 2011-04-28 Mike Reed <reed@google.com>

Source/WebCore/platform/graphics/chromium/FontChromiumWin.cpp

 /*
  * Copyright (C) 2006, 2007 Apple Computer, Inc.
  * Copyright (c) 2006, 2007, 2008, 2009, Google Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  * 
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 436 matching lines @@
                       const GlyphBuffer& glyphBuffer,
                       int from,
                       int numGlyphs,
                       const FloatPoint& point) const
 {
     SkColor color = graphicsContext->platformContext()->effectiveFillColor();
     unsigned char alpha = SkColorGetA(color);
     // 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,
                                             const FloatPoint& point,
                                             int h,
                                             int from,
                                             int to) const
 {
     UniscribeHelperTextRun state(run, *this);
     float left = static_cast<float>(point.x() + state.characterToX(from));
@@ skipping 83 matching lines @@
     int charIndex = state.xToCharacter(x);
 
     // XToCharacter will return -1 if the position is before the first
     // character (we get called like this sometimes).
     if (charIndex < 0)
         charIndex = 0;
     return charIndex;
 }
 
 } // namespace WebCore