Image decode color: Push color profile from browser to renderer

third_party/WebKit/Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 101 matching lines @@
 #include "platform/exported/WebActiveGestureAnimation.h"
 #include "platform/fonts/FontCache.h"
 #include "platform/graphics/Color.h"
 #include "platform/graphics/CompositorFactory.h"
 #include "platform/graphics/FirstPaintInvalidationTracking.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/Image.h"
 #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"
 #include "public/platform/WebCompositeAndReadbackAsyncCallback.h"
 #include "public/platform/WebCompositorSupport.h"
 #include "public/platform/WebDragData.h"
 #include "public/platform/WebFloatPoint.h"
 #include "public/platform/WebGestureCurve.h"
 #include "public/platform/WebImage.h"
 #include "public/platform/WebLayerTreeView.h"
@@ skipping 3051 matching lines @@
 void WebViewImpl::setZoomFactorForDeviceScaleFactor(float zoomFactorForDeviceScaleFactor)
 {
     m_zoomFactorForDeviceScaleFactor = zoomFactorForDeviceScaleFactor;
     if (!m_layerTreeView)
         return;
     setZoomLevel(m_zoomLevel);
 }
 
 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 that mean the WebView is going
away?

[ccameron, 2016/03/15 18:22:05]

Oh, if that's only-at-exit, then yes, this should be kept. Updated.

+        page()->setDeviceColorProfile(deviceProfile);
 }
 
 void WebViewImpl::resetDeviceColorProfileForTesting()
 {
     if (!page())
         return;
 
     page()->resetDeviceColorProfileForTesting();
 }
 
@@ skipping 1359 matching lines @@
 {
     // TODO(oshima): Investigate if this should return the ScreenInfo's scale factor rather than
     // page's scale factor, which can be 1 in use-zoom-for-dsf mode.
     if (!page())
         return 1;
 
     return page()->deviceScaleFactor();
 }
 
 } // namespace blink