Merge webkit.org at r51976 : ColorSpace type has been removed.

See the following WebKit changes ...
http://trac.webkit.org/changeset/50614
http://trac.webkit.org/changeset/51124
http://trac.webkit.org/changeset/51161

Change-Id: I690bb3aebc75b5a45396bb9bbcc4ee797ca3465b

1 files changed, 11 insertions, 19 deletions

diff --git a/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp b/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
index af1c144..9a86b84 100644
--- a/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
+++ b/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
@@ -330,23 +330,15 @@ static SkShader::TileMode SpreadMethod2TileMode(GradientSpreadMethod sm) {
     return mode;
 }
 
-static void extactShader(SkPaint* paint, ColorSpace cs, Pattern* pat,
-                         Gradient* grad)
+static void extactShader(SkPaint* paint, Pattern* pat, Gradient* grad)
 {
-    switch (cs) {
-        case PatternColorSpace:
-            // createPlatformPattern() returns a new inst
-            paint->setShader(pat->createPlatformPattern(
-                                                        TransformationMatrix()))->safeUnref();
-            break;
-        case GradientColorSpace: {
-            // grad->getShader() returns a cached obj
-            GradientSpreadMethod sm = grad->spreadMethod();
-            paint->setShader(grad->getShader(SpreadMethod2TileMode(sm)));
-            break;
-        }
-        default:
-            break;
+    if (pat) {
+        // createPlatformPattern() returns a new inst
+        paint->setShader(pat->createPlatformPattern(TransformationMatrix()))->safeUnref();
+    } else if (grad) {
+        // grad->getShader() returns a cached obj
+        GradientSpreadMethod sm = grad->spreadMethod();
+        paint->setShader(grad->getShader(SpreadMethod2TileMode(sm)));
     }
 }
     
@@ -675,7 +667,7 @@ void GraphicsContext::fillRect(const FloatRect& rect)
     
     m_data->setup_paint_fill(&paint);
 
-    extactShader(&paint, m_common->state.fillColorSpace,
+    extactShader(&paint,
                  m_common->state.fillPattern.get(),
                  m_common->state.fillGradient.get());
 
@@ -1131,7 +1123,7 @@ void GraphicsContext::fillPath()
     SkPaint paint;
     m_data->setup_paint_fill(&paint);
 
-    extactShader(&paint, m_common->state.fillColorSpace,
+    extactShader(&paint,
                  m_common->state.fillPattern.get(),
                  m_common->state.fillGradient.get());
 
@@ -1147,7 +1139,7 @@ void GraphicsContext::strokePath()
     SkPaint paint;
     m_data->setup_paint_stroke(&paint, NULL);
 
-    extactShader(&paint, m_common->state.strokeColorSpace,
+    extactShader(&paint,
                  m_common->state.strokePattern.get(),
                  m_common->state.strokeGradient.get());