Chromium Code Reviews| Index: third_party/WebKit/Source/web/WebViewImpl.cpp |
| diff --git a/third_party/WebKit/Source/web/WebViewImpl.cpp b/third_party/WebKit/Source/web/WebViewImpl.cpp |
| index c95ff4cfa344853cc5ae7c593179ea79f0fd582b..b37db0b9bc7aa3300379a3c4d5a33f6fada545fd 100644 |
| --- a/third_party/WebKit/Source/web/WebViewImpl.cpp |
| +++ b/third_party/WebKit/Source/web/WebViewImpl.cpp |
| @@ -119,6 +119,7 @@ |
| #include "platform/graphics/ImageBuffer.h" |
| #include "platform/graphics/gpu/DrawingBuffer.h" |
| #include "platform/graphics/paint/DrawingRecorder.h" |
| +#include "platform/image-decoders/ImageDecoder.h" |
| #include "platform/scroll/ScrollbarTheme.h" |
| #include "platform/weborigin/SchemeRegistry.h" |
| #include "public/platform/Platform.h" |
| @@ -3190,13 +3191,13 @@ void WebViewImpl::setZoomFactorForDeviceScaleFactor(float zoomFactorForDeviceSca |
| void WebViewImpl::setDeviceColorProfile(const WebVector<char>& colorProfile) |
| { |
| - if (!page()) |
| - return; |
| - |
| Vector<char> deviceProfile; |
| deviceProfile.append(colorProfile.data(), colorProfile.size()); |
| - page()->setDeviceColorProfile(deviceProfile); |
| + ImageDecoder::setOutputDeviceColorProfile(deviceProfile); |
| + |
| + if (page()) |
|
dcheng
2016/03/15 17:28:08
Why not early return if page() is null? Doesn't th
ccameron
2016/03/15 18:22:05
Oh, if that's only-at-exit, then yes, this should
|
| + page()->setDeviceColorProfile(deviceProfile); |
| } |
| void WebViewImpl::resetDeviceColorProfileForTesting() |