Merge webkit.org at r51976 : A ColorSpace argument is now passed to GraphicsContext methods.

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

Change-Id: I50c0864b1347e81839b8276a832311d7d1281148

1 files changed, 4 insertions, 4 deletions

diff --git a/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp b/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
index b480e2c..f2e168c 100644
--- a/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
+++ b/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
@@ -646,7 +646,7 @@ void GraphicsContext::drawConvexPolygon(size_t numPoints, const FloatPoint* poin
 }
 
 void GraphicsContext::fillRoundedRect(const IntRect& rect, const IntSize& topLeft, const IntSize& topRight,
-                                      const IntSize& bottomLeft, const IntSize& bottomRight, const Color& color)
+                                      const IntSize& bottomLeft, const IntSize& bottomRight, const Color& color, ColorSpace)
 {
     if (paintingDisabled())
         return;
@@ -682,7 +682,7 @@ void GraphicsContext::fillRect(const FloatRect& rect)
     GC2Canvas(this)->drawRect(rect, paint);
 }
 
-void GraphicsContext::fillRect(const FloatRect& rect, const Color& color)
+void GraphicsContext::fillRect(const FloatRect& rect, const Color& color, ColorSpace)
 {
     if (paintingDisabled())
         return;
@@ -859,7 +859,7 @@ void GraphicsContext::endTransparencyLayer()
         return m_data->mState->setupShadowPaint(paint, offset);
     }
 
-    void GraphicsContext::setPlatformStrokeColor(const Color& c) {
+    void GraphicsContext::setPlatformStrokeColor(const Color& c, ColorSpace) {
         m_data->setStrokeColor(c);
     }
     
@@ -867,7 +867,7 @@ void GraphicsContext::endTransparencyLayer()
         m_data->setStrokeThickness(f);
     }
 
-    void GraphicsContext::setPlatformFillColor(const Color& c) {
+    void GraphicsContext::setPlatformFillColor(const Color& c, ColorSpace) {
         m_data->setFillColor(c);
     }