InstantExtended: Prevent spurious themechanged/mostvisitedchanged events

chrome/renderer/searchbox/searchbox.cc

 // Copyright 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/renderer/searchbox/searchbox.h"
 
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/omnibox_focus_state.h"
@@ skipping 313 matching lines @@
     DVLOG(1) << render_view() << " OnKeyCaptureChange";
     extensions_v8::SearchBoxExtension::DispatchKeyCaptureChange(
         render_view()->GetWebView()->mainFrame());
   }
 }
 
 void SearchBox::OnSetDisplayInstantResults(bool display_instant_results) {
   display_instant_results_ = display_instant_results;
 }
 
+bool SearchBox::DidThemeInfoChange(const ThemeBackgroundInfo& theme_info) {

[samarth, 2013/05/03 22:18:45]

nit: Please move the anonymous namespace at the top of the file and just pass in
the old theme info.

+  return theme_info_.color_r != theme_info.color_r ||
+      theme_info_.color_g != theme_info.color_g ||
+      theme_info_.color_b != theme_info.color_b ||
+      theme_info_.color_a != theme_info.color_a ||
+      theme_info_.theme_id != theme_info.theme_id ||
+      theme_info_.image_horizontal_alignment !=
+          theme_info.image_horizontal_alignment ||
+      theme_info_.image_vertical_alignment !=
+          theme_info.image_vertical_alignment ||
+      theme_info_.image_tiling != theme_info.image_tiling ||
+      theme_info_.image_height != theme_info.image_height ||
+      theme_info_.has_attribution != theme_info.has_attribution;

[samarth, 2013/05/03 22:18:45]

Please also add a comment in instant_types.h to keep the fields in sync here if
new fields are added.

+}
+
 void SearchBox::OnThemeChanged(const ThemeBackgroundInfo& theme_info) {
+  if (!DidThemeInfoChange(theme_info))
+    return;
   theme_info_ = theme_info;
   if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
     extensions_v8::SearchBoxExtension::DispatchThemeChange(
         render_view()->GetWebView()->mainFrame());
   }
 }
 
 void SearchBox::OnFontInformationReceived(const string16& omnibox_font,
                                           size_t omnibox_font_size) {
   omnibox_font_ = omnibox_font;
@@ skipping 19 matching lines @@
   start_margin_ = 0;
   is_key_capture_enabled_ = false;
   theme_info_ = ThemeBackgroundInfo();
   // Don't reset display_instant_results_ to prevent clearing it on committed
   // results pages in extended mode. Otherwise resetting it is a no-op because
   // a new loader is created when it changes; see crbug.com/164662.
   // Also don't reset omnibox_font_ or omnibox_font_size_ since it never
   // changes.
 }
 
+bool SearchBox::DidMostVisitedItemsChange(

[samarth, 2013/05/03 22:18:45]

Likewise (anonymous namespace please).

+    const std::vector<InstantMostVisitedItemIDPair>& items) {
+  std::vector<InstantMostVisitedItemIDPair> oldItems;
+  most_visited_items_cache_.GetCurrentItems(&oldItems);
+  bool most_visited_changed = oldItems.size() != items.size();
+  if (!most_visited_changed) {
+    for (size_t i = 0; i < items.size(); i++) {
+      InstantMostVisitedItem oldItem = oldItems[i].second;
+      InstantMostVisitedItem newItem = items[i].second;
+      if (newItem.url != oldItem.url || newItem.title != oldItem.title) {
+        most_visited_changed = true;
+        break;
+      }
+    }
+  }
+  return most_visited_changed;
+}
+
 void SearchBox::OnMostVisitedChanged(
     const std::vector<InstantMostVisitedItemIDPair>& items) {
+  if (!DidMostVisitedItemsChange(items))
+    return;
+
   most_visited_items_cache_.AddItemsWithRestrictedID(items);
 
   if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
     extensions_v8::SearchBoxExtension::DispatchMostVisitedChanged(
         render_view()->GetWebView()->mainFrame());
   }
 }
 
 void SearchBox::GetMostVisitedItems(
     std::vector<InstantMostVisitedItemIDPair>* items) const {
   return most_visited_items_cache_.GetCurrentItems(items);
 }
 
 bool SearchBox::GetMostVisitedItemWithID(
     InstantRestrictedID most_visited_item_id,
     InstantMostVisitedItem* item) const {
   return most_visited_items_cache_.GetItemWithRestrictedID(most_visited_item_id,
                                                            item);
 }