A number of paint optimizations to improve overall paint times.

chrome/browser/ui/views/location_bar/location_bar_view.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 "chrome/browser/ui/views/location_bar/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/command_line.h"
@@ skipping 476 matching lines @@
 // DropdownBarHostDelegate
 void LocationBarView::SetFocusAndSelection(bool select_all) {
   FocusLocation(select_all);
 }
 
 void LocationBarView::SetAnimationOffset(int offset) {
   animation_offset_ = offset;
 }
 
 void LocationBarView::UpdateContentSettingsIcons() {
-  RefreshContentSettingViews();
-  Layout();
-  SchedulePaint();
+  if (RefreshContentSettingViews()) {
+    Layout();
+    SchedulePaint();
+  }
 }
 
 void LocationBarView::UpdateManagePasswordsIconAndBubble() {
-  RefreshManagePasswordsIconView();
-  Layout();
-  SchedulePaint();
+  if (RefreshManagePasswordsIconView()) {
+    Layout();
+    SchedulePaint();
+  }
   ShowManagePasswordsBubbleIfNeeded();
 }
 
 void LocationBarView::UpdatePageActions() {
   size_t count_before = page_action_views_.size();
-  RefreshPageActionViews();
-  RefreshScriptBubble();
+  bool changed = RefreshPageActionViews();
+  changed |= RefreshScriptBubble();
   if (page_action_views_.size() != count_before) {
     content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_EXTENSION_PAGE_ACTION_COUNT_CHANGED,
         content::Source<LocationBar>(this),
         content::NotificationService::NoDetails());
   }
 
-  Layout();
-  SchedulePaint();
+  if (changed) {
+    Layout();
+    SchedulePaint();
+  }
 }
 
 void LocationBarView::InvalidatePageActions() {
   size_t count_before = page_action_views_.size();
   DeletePageActionViews();
   if (page_action_views_.size() != count_before) {
     content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_EXTENSION_PAGE_ACTION_COUNT_CHANGED,
         content::Source<LocationBar>(this),
         content::NotificationService::NoDetails());
@@ skipping 61 matching lines @@
     star_view_->SetToggled(on);
 }
 
 void LocationBarView::ShowBookmarkPrompt() {
   if (star_view_ && star_view_->visible())
     BookmarkPromptView::ShowPrompt(star_view_, profile_->GetPrefs());
 }
 
 void LocationBarView::ZoomChangedForActiveTab(bool can_show_bubble) {
   DCHECK(zoom_view_);
-  RefreshZoomView();
-
-  Layout();
-  SchedulePaint();
+  if (RefreshZoomView()) {
+    Layout();
+    SchedulePaint();
+  }
 
   if (can_show_bubble && zoom_view_->visible() && delegate_->GetWebContents())
     ZoomBubbleView::ShowBubble(delegate_->GetWebContents(), true);
 }
 
 gfx::Point LocationBarView::GetLocationEntryOrigin() const {
   gfx::Point origin(location_entry_view_->bounds().origin());
   // If the UI layout is RTL, the coordinate system is not transformed and
   // therefore we need to adjust the X coordinate so that bubble appears on the
   // right hand side of the location bar.
@@ skipping 730 matching lines @@
   return (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) ?
       GetItemPadding() / 2 : 0;
 }
 
 int LocationBarView::GetHorizontalEdgeThickness() const {
   // In maximized popup mode, there isn't any edge.
   return (is_popup_mode_ && browser_ && browser_->window() &&
       browser_->window()->IsMaximized()) ? 0 : vertical_edge_thickness();
 }
 
-void LocationBarView::RefreshContentSettingViews() {
+bool LocationBarView::RefreshContentSettingViews() {
+  bool visibility_changed = false;
   for (ContentSettingViews::const_iterator i(content_setting_views_.begin());
        i != content_setting_views_.end(); ++i) {
+    const bool was_visible = (*i)->visible();
     (*i)->Update(GetToolbarModel()->input_in_progress() ?
         NULL : GetWebContents());
+    if (was_visible != (*i)->visible())
+      visibility_changed = true;
   }
+  return visibility_changed;
 }
 
 void LocationBarView::DeletePageActionViews() {
   for (PageActionViews::const_iterator i(page_action_views_.begin());
        i != page_action_views_.end(); ++i)
     RemoveChildView(*i);
   STLDeleteElements(&page_action_views_);
 }
 
-void LocationBarView::RefreshPageActionViews() {
+bool LocationBarView::RefreshPageActionViews() {
   if (is_popup_mode_)
-    return;
+    return false;
+
+  bool changed = false;
 
   // Remember the previous visibility of the page actions so that we can
   // notify when this changes.
   std::map<ExtensionAction*, bool> old_visibility;
   for (PageActionViews::const_iterator i(page_action_views_.begin());
        i != page_action_views_.end(); ++i) {
     old_visibility[(*i)->image_view()->page_action()] = (*i)->visible();
   }
 
   std::vector<ExtensionAction*> new_page_actions;
 
   WebContents* contents = delegate_->GetWebContents();
   if (contents) {
     extensions::TabHelper* extensions_tab_helper =
         extensions::TabHelper::FromWebContents(contents);
     extensions::LocationBarController* controller =
         extensions_tab_helper->location_bar_controller();
     new_page_actions = controller->GetCurrentActions();
   }
 
   // On startup we sometimes haven't loaded any extensions. This makes sure
   // we catch up when the extensions (and any page actions) load.
   if (page_actions_ != new_page_actions) {
+    changed = true;
+
     page_actions_.swap(new_page_actions);
     DeletePageActionViews();  // Delete the old views (if any).
 
     page_action_views_.resize(page_actions_.size());
     View* right_anchor = open_pdf_in_reader_view_;
     if (!right_anchor)
       right_anchor = star_view_;
     if (!right_anchor)
       right_anchor = script_bubble_icon_view_;
     DCHECK(right_anchor);
@@ skipping 14 matching lines @@
 
     for (PageActionViews::const_iterator i(page_action_views_.begin());
          i != page_action_views_.end(); ++i) {
       (*i)->UpdateVisibility(
           GetToolbarModel()->input_in_progress() ? NULL : contents, url);
 
       // Check if the visibility of the action changed and notify if it did.
       ExtensionAction* action = (*i)->image_view()->page_action();
       if (old_visibility.find(action) == old_visibility.end() ||
           old_visibility[action] != (*i)->visible()) {
+        changed = true;
         content::NotificationService::current()->Notify(
             chrome::NOTIFICATION_EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED,
             content::Source<ExtensionAction>(action),
             content::Details<WebContents>(contents));
       }
     }
   }
+  return changed;
 }
 
 size_t LocationBarView::ScriptBubbleScriptsRunning() {
   WebContents* contents = delegate_->GetWebContents();
   if (!contents)
     return false;
   extensions::TabHelper* extensions_tab_helper =
       extensions::TabHelper::FromWebContents(contents);
   if (!extensions_tab_helper)
     return false;
   extensions::ScriptBubbleController* script_bubble_controller =
       extensions_tab_helper->script_bubble_controller();
   if (!script_bubble_controller)
     return false;
   size_t script_count =
       script_bubble_controller->extensions_running_scripts().size();
   return script_count;
 }
 
-void LocationBarView::RefreshScriptBubble() {
+bool LocationBarView::RefreshScriptBubble() {
   if (!script_bubble_icon_view_)
-    return;
+    return false;
   size_t script_count = ScriptBubbleScriptsRunning();
+  const bool was_visible = script_bubble_icon_view_->visible();
   script_bubble_icon_view_->SetVisible(script_count > 0);
   if (script_count > 0)
     script_bubble_icon_view_->SetScriptCount(script_count);
+  return was_visible != script_bubble_icon_view_->visible();
 }
 
-void LocationBarView::RefreshZoomView() {
+bool LocationBarView::RefreshZoomView() {
   DCHECK(zoom_view_);
   WebContents* web_contents = GetWebContents();
   if (!web_contents)
-    return;
+    return false;
+  const bool was_visible = zoom_view_->visible();
   zoom_view_->Update(ZoomController::FromWebContents(web_contents));
+  return was_visible != zoom_view_->visible();
 }
 
-void LocationBarView::RefreshManagePasswordsIconView() {
+bool LocationBarView::RefreshManagePasswordsIconView() {
   DCHECK(manage_passwords_icon_view_);
   WebContents* web_contents = GetWebContents();
   if (!web_contents)
-    return;
+    return false;
+  const bool was_visible = manage_passwords_icon_view_->visible();
   manage_passwords_icon_view_->Update(
       ManagePasswordsIconController::FromWebContents(web_contents));
+  return was_visible != manage_passwords_icon_view_->visible();
 }
 
 void LocationBarView::RefreshTranslateIcon() {
   WebContents* web_contents = GetWebContents();
   if (!web_contents || !CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableTranslateNewUX))
     return;
   bool enabled = TranslateTabHelper::FromWebContents(
       web_contents)->language_state().translate_enabled();
   command_updater()->UpdateCommandEnabled(IDC_TRANSLATE_PAGE, enabled);
@@ skipping 66 matching lines @@
     bounds.Inset(-(horizontal_padding + 1) / 2, 0);
     location_bar_util::PaintExtensionActionBackground(
         *(*page_action_view)->image_view()->page_action(),
         tab_id, canvas, bounds, text_color, background_color);
   }
 }
 
 void LocationBarView::AccessibilitySetValue(const string16& new_value) {
   location_entry_->SetUserText(new_value);
 }