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..7c54ba05caa36b6e1a919bb8eaf35f5a8d647c9c 100644
--- a/chrome/renderer/searchbox/searchbox.cc
+++ b/chrome/renderer/searchbox/searchbox.cc
@@ -24,6 +24,36 @@ namespace {
 // Size of the results cache.
 const size_t kMaxInstantAutocompleteResultItemCacheSize = 100;
 
+bool IsThemeInfoEqual(const ThemeBackgroundInfo& new_theme_info,
+    const ThemeBackgroundInfo& old_theme_info) {
+  return old_theme_info.color_r == new_theme_info.color_r &&
+      old_theme_info.color_g == new_theme_info.color_g &&
+      old_theme_info.color_b == new_theme_info.color_b &&
+      old_theme_info.color_a == new_theme_info.color_a &&
+      old_theme_info.theme_id == new_theme_info.theme_id &&
+      old_theme_info.image_horizontal_alignment ==
+          new_theme_info.image_horizontal_alignment &&
+      old_theme_info.image_vertical_alignment ==
+          new_theme_info.image_vertical_alignment &&
+      old_theme_info.image_tiling == new_theme_info.image_tiling &&
+      old_theme_info.image_height == new_theme_info.image_height &&
+      old_theme_info.has_attribution == new_theme_info.has_attribution;
+}
+
+bool AreMostVisitedItemsEqual(
+    const std::vector<InstantMostVisitedItemIDPair>& new_tems,

[sreeram, 2013/05/06 14:31:56]

Typo: new_tems -> new_items

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

Done.

+    const std::vector<InstantMostVisitedItemIDPair>& old_items) {
+  if (old_items.size() != new_tems.size())
+    return false;
+  for (size_t i = 0; i < new_tems.size(); i++) {
+    InstantMostVisitedItem old_item = old_items[i].second;

[sreeram, 2013/05/06 14:31:56]

const InstantMostVisitedItem&

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

Done.

+    InstantMostVisitedItem new_item = new_tems[i].second;

[sreeram, 2013/05/06 14:31:56]

const InstantMostVisitedItem&

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

Done.

+    if (new_item.url != old_item.url || new_item.title != old_item.title)
+      return false;
+  }
+  return true;
+}
+
 }  // namespace
 
 SearchBox::SearchBox(content::RenderView* render_view)
@@ -329,6 +359,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 +409,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()) {