Merge WebKit at r74534: Fix FontAndroid.cpp (getShadow)

Update GraphicsContext::getShadow callsite with new
parameter.

See http://trac.webkit.org/changeset/74463

Change-Id: Ibfb36831800a57968963a5619c8425f5551829f5

diff --git a/WebCore/platform/graphics/android/FontAndroid.cpp b/WebCore/platform/graphics/android/FontAndroid.cpp
index 520af5d..64d6aca 100644 (file)
--- a/WebCore/platform/graphics/android/FontAndroid.cpp
+++ b/WebCore/platform/graphics/android/FontAndroid.cpp
@@ -83,7 +83,8 @@ static bool setupForText(SkPaint* paint, GraphicsContext* gc,
     FloatSize shadowOffset;
     float shadowBlur;
     Color shadowColor;
-    bool hasShadow = gc->getShadow(shadowOffset, shadowBlur, shadowColor);
+    ColorSpace shadowColorSpace;
+    bool hasShadow = gc->getShadow(shadowOffset, shadowBlur, shadowColor, shadowColorSpace);
     bool hasBothStrokeAndFill =
         (mode & (cTextStroke | cTextFill)) == (cTextStroke | cTextFill);
     if (hasShadow || hasBothStrokeAndFill) {