Start caching the theme color in web_contents

content/browser/web_contents/web_contents_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/web_contents/web_contents_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 110 matching lines @@
 namespace {
 
 const int kMinimumDelayBetweenLoadingUpdatesMS = 100;
 
 // This matches what Blink's ProgressTracker has traditionally used for a
 // minimum progress value.
 const double kMinimumLoadingProgress = 0.1;
 
 const char kDotGoogleDotCom[] = ".google.com";
 
+const SkColor kDefaultThemeColor = 0xFFF2F2F2;

[no sievers, 2015/03/05 20:18:41]

It would be nice if this could be set by the application.

What's actually easier is to not worry about the default color here at all, but
rather make it 'SkColor* WebContents::GetThemeColor()' which returns NULL for
none/default (for example by having scoped_ptr<SkColor>
WebContentsImpl::theme_color_).

Then you could either plumb this up to Java by doing the same
(android.graphics.Color WebContents.getThemeColor() which could return null), or
you split it into two APIs in web_contents_android.cc
(isThemeColorValid()/getThemeColor()).

[Yusuf, 2015/03/05 22:05:15]

Moved to setting it to transparent and handling the rest on the java side. We
can not set the omnibox to transparent anyway, so I think using
Sk_ColorTRANSPARENT is a good solution.

+
 #if defined(OS_ANDROID)
 const char kWebContentsAndroidKey[] = "web_contents_android";
 #endif  // OS_ANDROID
 
 base::LazyInstance<std::vector<WebContentsImpl::CreatedCallback> >
 g_created_callbacks = LAZY_INSTANCE_INITIALIZER;
 
 static int StartDownload(RenderFrameHost* rfh,
                          const GURL& url,
                          bool is_favicon,
@@ skipping 193 matching lines @@
       crashed_status_(base::TERMINATION_STATUS_STILL_RUNNING),
       crashed_error_code_(0),
       waiting_for_response_(false),
       load_state_(net::LOAD_STATE_IDLE, base::string16()),
       loading_total_progress_(0.0),
       loading_frames_in_progress_(0),
       upload_size_(0),
       upload_position_(0),
       displayed_insecure_content_(false),
       has_accessed_initial_document_(false),
+      theme_color_(kDefaultThemeColor),
       capturer_count_(0),
       should_normally_be_visible_(true),
       is_being_destroyed_(false),
       notify_disconnection_(false),
       dialog_manager_(NULL),
       is_showing_before_unload_dialog_(false),
       last_active_time_(base::TimeTicks::Now()),
       closed_by_user_gesture_(false),
       minimum_zoom_percent_(static_cast<int>(kMinimumZoomFactor * 100)),
       maximum_zoom_percent_(static_cast<int>(kMaximumZoomFactor * 100)),
@@ skipping 359 matching lines @@
   RenderWidgetHost* const widget_host =
       RenderWidgetHostImpl::FromID(GetRenderProcessHost()->GetID(),
                                    GetFullscreenWidgetRoutingID());
   return widget_host ? widget_host->GetView() : NULL;
 }
 
 WebContentsView* WebContentsImpl::GetView() const {
   return view_.get();
 }
 
+SkColor WebContentsImpl::GetThemeColor() const {
+  return theme_color_;
+}
+
 void WebContentsImpl::SetAccessibilityMode(AccessibilityMode mode) {
   if (mode == accessibility_mode_)
     return;
 
   accessibility_mode_ = mode;
   frame_tree_.ForEach(
       base::Bind(&ForEachFrameInternal,
                  base::Bind(&SetAccessibilityModeOnFrame, mode)));
   frame_tree_.ForEach(
       base::Bind(&ForEachPendingFrameInternal,
@@ skipping 1977 matching lines @@
     // transition (this is also why the mouse cursor remains as a hand after
     // clicking on a link); see bugs 1184641 and 980803. We don't want to
     // clear the bubble when a user navigates to a named anchor in the same
     // page.
     UpdateTargetURL(render_frame_host->GetRenderViewHost(), GURL());
 
     RenderWidgetHostViewBase* rwhvb =
         static_cast<RenderWidgetHostViewBase*>(GetRenderWidgetHostView());
     if (rwhvb)
       rwhvb->OnDidNavigateMainFrameToNewPage();
+
+    // Reset theme color on navigation to new page.
+    theme_color_ = kDefaultThemeColor;
   }
 
   if (!details.is_in_page) {
     // Once the main frame is navigated, we're no longer considered to have
     // displayed insecure content.
     displayed_insecure_content_ = false;
     SSLManager::NotifySSLInternalStateChanged(
         GetController().GetBrowserContext());
   }
 
@@ skipping 32 matching lines @@
   if (force_disable_overscroll_content_)
     return false;
 
   if (delegate_)
     return delegate_->CanOverscrollContent();
 
   return false;
 }
 
 void WebContentsImpl::OnThemeColorChanged(SkColor theme_color) {
-  FOR_EACH_OBSERVER(WebContentsObserver, observers_,
-                    DidChangeThemeColor(theme_color));
+  // Update the theme color. This is to be published to observers on visually
+  // non empty paint.
+  theme_color_ = theme_color;
 }
 
 void WebContentsImpl::OnDidLoadResourceFromMemoryCache(
     const GURL& url,
     const std::string& security_info,
     const std::string& http_method,
     const std::string& mime_type,
     ResourceType resource_type) {
 
   // Send out a notification that we loaded a resource from our memory cache.
@@ skipping 473 matching lines @@
 
 void WebContentsImpl::OnMediaPausedNotification(int64 player_cookie) {
   RemoveMediaPlayerEntry(player_cookie, &active_audio_players_);
   RemoveMediaPlayerEntry(player_cookie, &active_video_players_);
   MaybeReleasePowerSaveBlockers();
 }
 
 void WebContentsImpl::OnFirstVisuallyNonEmptyPaint() {
   FOR_EACH_OBSERVER(WebContentsObserver, observers_,
                     DidFirstVisuallyNonEmptyPaint());
+
+  // Theme color should have updated by now if there was one.
+  FOR_EACH_OBSERVER(WebContentsObserver, observers_,
+                    DidChangeThemeColor(theme_color_));

[no sievers, 2015/03/05 20:18:41]

Should we cache the last sent color and only notify if it really changed?

[Yusuf, 2015/03/05 22:05:15]

Done.

 }
 
 void WebContentsImpl::DidChangeVisibleSSLState() {
   if (delegate_)
     delegate_->VisibleSSLStateChanged(this);
 }
 
 void WebContentsImpl::NotifyBeforeFormRepostWarningShow() {
   FOR_EACH_OBSERVER(WebContentsObserver, observers_,
                     BeforeFormRepostWarningShow());
@@ skipping 1260 matching lines @@
   node->render_manager()->ResumeResponseDeferredAtStart();
 }
 
 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
   force_disable_overscroll_content_ = force_disable;
   if (view_)
     view_->SetOverscrollControllerEnabled(CanOverscrollContent());
 }
 
 }  // namespace content