diff options
author | Ben Murdoch <benm@google.com> | 2010-10-22 16:02:07 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:38:49 +0100 |
commit | b73606ba44efcb32effeb03603d2eaa402455062 (patch) | |
tree | 3810b7fbed3c2508f97efb8f962422f28aeee995 /WebKit | |
parent | 41c8cd06bd25769654e321d1222856182ebad067 (diff) | |
download | external_webkit-b73606ba44efcb32effeb03603d2eaa402455062.zip external_webkit-b73606ba44efcb32effeb03603d2eaa402455062.tar.gz external_webkit-b73606ba44efcb32effeb03603d2eaa402455062.tar.bz2 |
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
Diffstat (limited to 'WebKit')
-rw-r--r-- | WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp index a796084..1903f2e 100644 --- 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(); } |