InstantExtended: Prevent spurious themechanged/mostvisitedchanged events

chrome/renderer/searchbox/searchbox.cc

Index: chrome/renderer/searchbox/searchbox.cc
diff --git a/chrome/renderer/searchbox/searchbox.cc b/chrome/renderer/searchbox/searchbox.cc
index 287fad330eab28167e5ae9c318ab51eb2bf513d9..3522baf3015cb2abb453f2001d8e978712210e45 100644
--- a/chrome/renderer/searchbox/searchbox.cc
+++ b/chrome/renderer/searchbox/searchbox.cc
@@ -24,6 +24,37 @@ namespace {
 // Size of the results cache.
 const size_t kMaxInstantAutocompleteResultItemCacheSize = 100;
 
+bool IsThemeInfoEqual(const ThemeBackgroundInfo& theme_info,
+    const ThemeBackgroundInfo& old_theme_info) {
+  return old_theme_info.color_r == theme_info.color_r &&
+      old_theme_info.color_g == theme_info.color_g &&
+      old_theme_info.color_b == theme_info.color_b &&
+      old_theme_info.color_a == theme_info.color_a &&
+      old_theme_info.theme_id == theme_info.theme_id &&
+      old_theme_info.image_horizontal_alignment ==
+          theme_info.image_horizontal_alignment &&
+      old_theme_info.image_vertical_alignment ==
+          theme_info.image_vertical_alignment &&
+      old_theme_info.image_tiling == theme_info.image_tiling &&
+      old_theme_info.image_height == theme_info.image_height &&
+      old_theme_info.has_attribution == theme_info.has_attribution;
+}
+
+bool AreMostVisitedItemsEqual(
+    const std::vector<InstantMostVisitedItemIDPair>& items,
+    const std::vector<InstantMostVisitedItemIDPair>& old_items) {
+  if (old_items.size() != items.size())
+    return false;
+  for (size_t i = 0; i < items.size(); i++) {
+    InstantMostVisitedItem old_item = old_items[i].second;
+    InstantMostVisitedItem new_item = items[i].second;

[sreeram, 2013/05/05 02:19:12]

"const InstantMostVisitedItem&" in both lines above.

[sreeram, 2013/05/05 02:19:12]

It's mildly inconsistent to have "items" and "old_items", but "new_item" and
"old_item".

I'd rather that you just made all the non-old stuff above "new_*" (i.e.,
"new_theme_info" and "new_items").

[Anuj, 2013/05/06 17:44:44]

Done.

[Anuj, 2013/05/06 17:44:44]

Done.

+    if (new_item.url != old_item.url || new_item.title != old_item.title) {
+      return false;

[sreeram, 2013/05/05 02:19:12]

Nit: No braces.

[Anuj, 2013/05/06 17:44:44]

Done.

+    }
+  }
+  return true;
+}
+
 }  // namespace
 
 SearchBox::SearchBox(content::RenderView* render_view)
@@ -329,6 +360,8 @@ void SearchBox::OnSetDisplayInstantResults(bool display_instant_results) {
 }
 
 void SearchBox::OnThemeChanged(const ThemeBackgroundInfo& theme_info) {
+  if (IsThemeInfoEqual(theme_info, theme_info_))
+    return;
   theme_info_ = theme_info;
   if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
     extensions_v8::SearchBoxExtension::DispatchThemeChange(
@@ -377,6 +410,11 @@ void SearchBox::SetQuery(const string16& query, bool verbatim) {
 
 void SearchBox::OnMostVisitedChanged(
     const std::vector<InstantMostVisitedItemIDPair>& items) {
+  std::vector<InstantMostVisitedItemIDPair> old_items;
+  most_visited_items_cache_.GetCurrentItems(&old_items);
+  if (AreMostVisitedItemsEqual(items, old_items))
+    return;
+
   most_visited_items_cache_.AddItemsWithRestrictedID(items);
 
   if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {