Merge Webkit at r70209: ImageColorSpace type no longer exists.

It has been replaced with ColorSpace. Also DeviceColorSpace
has been renamed ColorSpaceDeviceRGB.
See http://trac.webkit.org/changeset/70143

Change-Id: Ib603dcef04dcfa51fca142d8b3d03689a18e110f

diff --git a/WebCore/platform/graphics/android/ImageBufferAndroid.cpp b/WebCore/platform/graphics/android/ImageBufferAndroid.cpp
index 3b89777..2f9e543 100644 (file)
--- a/WebCore/platform/graphics/android/ImageBufferAndroid.cpp
+++ b/WebCore/platform/graphics/android/ImageBufferAndroid.cpp
@@ -28,6 +28,7 @@
 
 #include "Base64.h"
 #include "BitmapImage.h"
+#include "ColorSpace.h"
 #include "ImageData.h"
 #include "GraphicsContext.h"
 #include "NotImplemented.h"
@@ -49,7 +50,7 @@ ImageBufferData::ImageBufferData(const IntSize&)
 {
 }
 
-ImageBuffer::ImageBuffer(const IntSize& size, ImageColorSpace colorSpace, bool& success)
+ImageBuffer::ImageBuffer(const IntSize& size, ColorSpace, bool& success)
     : m_data(size)
     , m_size(size)
 {

diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
index a796084..1903f2e 100644 (file)
--- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
@@ -1065,7 +1065,7 @@ public:
         ctx->save();
         ctx->clip(frameRect());
 
-        ctx->setFillColor(Color::white, DeviceColorSpace);
+        ctx->setFillColor(Color::white, ColorSpaceDeviceRGB);
         ctx->fillRect(frameRect());
         if (frameRect().contains(imageRect)) {
             // Leave a 2 pixel padding.
@@ -1073,12 +1073,12 @@ public:
             IntRect innerRect = frameRect();
             innerRect.inflate(-pixelWidth);
             // Draw a 2 pixel light gray border.
-            ctx->setStrokeColor(Color::lightGray, DeviceColorSpace);
+            ctx->setStrokeColor(Color::lightGray, ColorSpaceDeviceRGB);
             ctx->strokeRect(innerRect, pixelWidth);
         }
 
         // Draw the image in the center
-        ctx->drawImage(image.get(), DeviceColorSpace, imageRect.location());
+        ctx->drawImage(image.get(), ColorSpaceDeviceRGB, imageRect.location());
         ctx->restore();
     }