Merge webkit.org at r51976 : Image::draw() and drawPattern() now take a ColorSpace.

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

Change-Id: I276253611ffe7518733fc7af51b0dfcc5f5d8691

1 files changed, 4 insertions, 3 deletions

diff --git a/WebCore/platform/graphics/android/ImageAndroid.cpp b/WebCore/platform/graphics/android/ImageAndroid.cpp
index 831c6f3..486200d 100644
--- a/WebCore/platform/graphics/android/ImageAndroid.cpp
+++ b/WebCore/platform/graphics/android/ImageAndroid.cpp
@@ -186,7 +186,8 @@ static inline void fixPaintForBitmapsThatMaySeam(SkPaint* paint) {
 }
 
 void BitmapImage::draw(GraphicsContext* ctxt, const FloatRect& dstRect,
-                   const FloatRect& srcRect, CompositeOperator compositeOp)
+                   const FloatRect& srcRect, ColorSpace,
+                   CompositeOperator compositeOp)
 {
     startAnimation();
 
@@ -249,8 +250,8 @@ void BitmapImage::setURL(const String& str)
 
 void Image::drawPattern(GraphicsContext* ctxt, const FloatRect& srcRect,
                         const TransformationMatrix& patternTransform,
-                        const FloatPoint& phase, CompositeOperator compositeOp,
-                        const FloatRect& destRect)
+                        const FloatPoint& phase, ColorSpace,
+                        CompositeOperator compositeOp, const FloatRect& destRect)
 {
     SkBitmapRef* image = this->nativeImageForCurrentFrame();
     if (!image) { // If it's too early we won't have an image yet.