Image decode color: Push color profile from browser to renderer

content/browser/renderer_host/render_widget_host_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 
 #include <math.h>
 #include <set>
 #include <utility>
 
@@ skipping 54 matching lines @@
 #include "content/public/common/content_switches.h"
 #include "content/public/common/result_codes.h"
 #include "content/public/common/web_preferences.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
 #include "skia/ext/image_operations.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/public/web/WebCompositionUnderline.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
+#include "ui/gfx/color_profile.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gfx/geometry/vector2d_conversions.h"
 #include "ui/gfx/skbitmap_operations.h"
 #include "ui/snapshot/snapshot.h"
 
 #if defined(OS_WIN)
 #include "content/common/plugin_constants_win.h"
 #endif
 
 #if defined(OS_MACOSX)
@@ skipping 128 matching lines @@
       next_browser_snapshot_id_(1),
       owned_by_render_frame_host_(false),
       is_focused_(false),
       scale_input_to_viewport_(IsUseZoomForDSFEnabled()),
       hung_renderer_delay_(
           base::TimeDelta::FromMilliseconds(kHungRendererDelayMs)),
       new_content_rendering_delay_(
           base::TimeDelta::FromMilliseconds(kNewContentRenderingDelayMs)),
       mouse_wheel_coalesce_timer_(new base::ElapsedTimer()),
       weak_factory_(this) {
+#if defined(OS_WIN)
+  // Update the display color profile cache so that it is likely to be up to
+  // date when the renderer process requests the color profile.
+  BrowserThread::PostBlockingPoolTask(
+      FROM_HERE, base::Bind(&gfx::UpdateDisplayColorProfileCache));
+#endif
+
   CHECK(delegate_);
   CHECK_NE(MSG_ROUTING_NONE, routing_id_);
 
   std::pair<RoutingIDWidgetMap::iterator, bool> result =
       g_routing_id_widget_map.Get().insert(std::make_pair(
           RenderWidgetHostID(process->GetID(), routing_id_), this));
   CHECK(result.second) << "Inserting a duplicate item!";
   process_->AddRoute(routing_id_, this);
 
   // If we're initially visible, tell the process host that we're alive.
@@ skipping 402 matching lines @@
 
   old_resize_params_ = make_scoped_ptr(new ResizeParams(resize_params));
 }
 
 void RenderWidgetHostImpl::WasResized() {
   // Skip if the |delegate_| has already been detached because
   // it's web contents is being deleted.
   if (resize_ack_pending_ || !process_->HasConnection() || !view_ ||
       !renderer_initialized_ || auto_resize_enabled_ || !delegate_) {
     if (resize_ack_pending_ && color_profile_out_of_date_)
-      DispatchColorProfile();
+      SendColorProfile();
     return;
   }
 
   scoped_ptr<ResizeParams> params(new ResizeParams);
   if (color_profile_out_of_date_)
-    DispatchColorProfile();
+    SendColorProfile();
   if (!GetResizeParams(params.get()))
     return;
 
   bool width_changed =
       !old_resize_params_ ||
       old_resize_params_->new_size.width() != params->new_size.width();
   if (Send(new ViewMsg_Resize(routing_id_, *params))) {
     resize_ack_pending_ = params->needs_resize_ack;
     old_resize_params_.swap(params);
   }
 
   if (delegate_)
     delegate_->RenderWidgetWasResized(this, width_changed);
 }
 
-void RenderWidgetHostImpl::DispatchColorProfile() {
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+void RenderWidgetHostImpl::SendColorProfile() {
   static bool image_profiles = base::CommandLine::ForCurrentProcess()->
      HasSwitch(switches::kEnableImageColorProfiles);
   if (!image_profiles)
     return;
-#if defined(OS_WIN)
-  // Windows will read disk to get the color profile data if needed, so
-  // dispatch the SendColorProfile() work off the UI thread.
-  BrowserThread::PostBlockingPoolTask(
-      FROM_HERE,
-      base::Bind(&RenderWidgetHostImpl::SendColorProfile,
-                 weak_factory_.GetWeakPtr()));
-#elif !defined(OS_CHROMEOS) && !defined(OS_IOS) && !defined(OS_ANDROID)
-  // Only support desktop Mac and Linux at this time.
-  SendColorProfile();
-#endif
-#endif
-}
 
-void RenderWidgetHostImpl::SendColorProfile() {
   if (!view_ || !delegate_)
     return;
   DCHECK(!view_->GetRequestedRendererSize().IsEmpty());
-#if defined(OS_WIN)
-  DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI));
-  DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::IO));
-#endif
   std::vector<char> color_profile;
   if (!GetScreenColorProfile(&color_profile))
     return;
   if (!renderer_initialized_ || !process_->HasConnection())
     return;
   if (!Send(new ViewMsg_ColorProfile(routing_id_, color_profile)))
     return;
   color_profile_out_of_date_ = false;
 }
 
@@ skipping 1537 matching lines @@
 }
 
 #if defined(OS_WIN)
 gfx::NativeViewAccessible
     RenderWidgetHostImpl::GetParentNativeViewAccessible() {
   return delegate_ ? delegate_->GetParentNativeViewAccessible() : NULL;
 }
 #endif
 
 }  // namespace content