Merge in WebKit r47029.

1 files changed, 0 insertions, 24 deletions

diff --git a/WebCore/platform/graphics/skia/SkiaFontWin.cpp b/WebCore/platform/graphics/skia/SkiaFontWin.cpp
index 7f12508..f1c5cdc 100644
--- a/WebCore/platform/graphics/skia/SkiaFontWin.cpp
+++ b/WebCore/platform/graphics/skia/SkiaFontWin.cpp
@@ -267,21 +267,11 @@ static bool skiaDrawText(HFONT hfont,
                          SkCanvas* canvas,
                          const SkPoint& point,
                          SkPaint* paint,
-                         const TransformationMatrix& transformationMatrix,
-                         Gradient* gradient,
-                         Pattern* pattern,
                          const WORD* glyphs,
                          const int* advances,
                          const GOFFSET* offsets,
                          int numGlyphs)
 {
-    SkShader* shader = NULL;
-    if (gradient)
-        shader = gradient->platformGradient();
-    else if (pattern)
-        shader = pattern->createPlatformPattern(transformationMatrix);
-
-    paint->setShader(shader);
     float x = point.fX, y = point.fY;
 
     for (int i = 0; i < numGlyphs; i++) {
@@ -326,14 +316,7 @@ bool paintSkiaText(GraphicsContext* context,
     bool didFill = false;
 
     if ((textMode & cTextFill) && SkColorGetA(paint.getColor())) {
-        Gradient* fillGradient = 0;
-        Pattern* fillPattern = 0;
-        if (context->fillColorSpace() == GradientColorSpace)
-            fillGradient = context->fillGradient();
-        else if (context->fillColorSpace() == PatternColorSpace)
-            fillPattern = context->fillPattern();
         if (!skiaDrawText(hfont, dc, platformContext->canvas(), *origin, &paint,
-                          context->getCTM(), fillGradient, fillPattern,
                           &glyphs[0], &advances[0], &offsets[0], numGlyphs))
             return false;
         didFill = true;
@@ -360,14 +343,7 @@ bool paintSkiaText(GraphicsContext* context,
             paint.setLooper(0)->safeUnref();
         }
 
-        Gradient* strokeGradient = 0;
-        Pattern* strokePattern = 0;
-        if (context->strokeColorSpace() == GradientColorSpace)
-            strokeGradient = context->strokeGradient();
-        else if (context->strokeColorSpace() == PatternColorSpace)
-            strokePattern = context->strokePattern();
         if (!skiaDrawText(hfont, dc, platformContext->canvas(), *origin, &paint,
-                          context->getCTM(), strokeGradient, strokePattern,
                           &glyphs[0], &advances[0], &offsets[0], numGlyphs))
             return false;
     }