Rip out browser-side RID caching for most visited items.

chrome/renderer/searchbox/searchbox_extension.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_extension.h"
 
 #include "base/i18n/rtl.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 67 matching lines @@
       s->WriteUtf8(WriteInto(&result, len + 1));
   }
   return result;
 }
 
 void Dispatch(WebKit::WebFrame* frame, const WebKit::WebString& script) {
   if (!frame) return;
   frame->executeScript(WebKit::WebScriptSource(script));
 }
 
-v8::Handle<v8::String> GenerateThumbnailURL(uint64 most_visited_item_id) {
-  return UTF8ToV8String(
-      base::StringPrintf("chrome-search://thumb/%s",
-                         base::Uint64ToString(most_visited_item_id).c_str()));
+v8::Handle<v8::String> GenerateThumbnailURL(
+    int render_view_id,
+    InstantRestrictedID most_visited_item_id) {
+  return UTF8ToV8String(base::StringPrintf("chrome-search://thumb/%d/%d",
+                                           render_view_id,
+                                           most_visited_item_id));
 }
 
-v8::Handle<v8::String> GenerateFaviconURL(uint64 most_visited_item_id) {
-  return UTF8ToV8String(
-      base::StringPrintf("chrome-search://favicon/%s",
-                         base::Uint64ToString(most_visited_item_id).c_str()));
+v8::Handle<v8::String> GenerateFaviconURL(
+    int render_view_id,
+    InstantRestrictedID most_visited_item_id) {
+  return UTF8ToV8String(base::StringPrintf("chrome-search://favicon/%d/%d",
+                                           render_view_id,
+                                           most_visited_item_id));
 }
 
 // If |url| starts with |prefix|, removes |prefix|.
 void StripPrefix(string16* url, const string16& prefix) {
   if (StartsWith(*url, prefix, true))
     url->erase(0, prefix.length());
 }
 
 // Removes leading "http://" or "http://www." from |url| unless |user_input|
 // starts with those prefixes.
@@ skipping 56 matching lines @@
                     v8::Int32::New(result.relevance));
   obj->Set(v8::String::New("rankingData"), ranking_data);
   return obj;
 }
 
 // Populates a Javascript MostVisitedItem object from |mv_item|.
 // NOTE: Includes "url", "title" and "domain" which are private data, so should
 // not be returned to the Instant page. These should be erased before returning
 // the object. See GetMostVisitedItemsWrapper() in searchbox_api.js.
 v8::Handle<v8::Object> GenerateMostVisitedItem(
+    int render_view_id,
     InstantRestrictedID restricted_id,
     const InstantMostVisitedItem &mv_item) {
   // We set the "dir" attribute of the title, so that in RTL locales, a LTR
   // title is rendered left-to-right and truncated from the right. For
   // example, the title of http://msdn.microsoft.com/en-us/default.aspx is
   // "MSDN: Microsoft developer network". In RTL locales, in the New Tab
   // page, if the "dir" of this title is not specified, it takes Chrome UI's
   // directionality. So the title will be truncated as "soft developer
   // network". Setting the "dir" attribute as "ltr" renders the truncated
   // title as "MSDN: Microsoft D...". As another example, the title of
   // http://yahoo.com is "Yahoo!". In RTL locales, in the New Tab page, the
   // title will be rendered as "!Yahoo" if its "dir" attribute is not set to
   // "ltr".
   std::string direction;
   if (base::i18n::StringContainsStrongRTLChars(mv_item.title))
     direction = kRTLHtmlTextDirection;
   else
     direction = kLTRHtmlTextDirection;
 
   string16 title = mv_item.title;
   if (title.empty())
     title = UTF8ToUTF16(mv_item.url.spec());
 
   v8::Handle<v8::Object> obj = v8::Object::New();
   obj->Set(v8::String::New("rid"), v8::Int32::New(restricted_id));
   obj->Set(v8::String::New("thumbnailUrl"),
-           GenerateThumbnailURL(restricted_id));
+           GenerateThumbnailURL(render_view_id, restricted_id));
   obj->Set(v8::String::New("faviconUrl"),
-           GenerateFaviconURL(restricted_id));
+           GenerateFaviconURL(render_view_id, restricted_id));
   obj->Set(v8::String::New("title"), UTF16ToV8String(title));
   obj->Set(v8::String::New("domain"), UTF8ToV8String(mv_item.url.host()));
   obj->Set(v8::String::New("direction"), UTF8ToV8String(direction));
   obj->Set(v8::String::New("url"), UTF8ToV8String(mv_item.url.spec()));
   return obj;
 }
 
 // Returns the render view for the current JS context if it matches |origin|,
 // otherwise returns NULL. Used to restrict methods that access suggestions and
 // most visited data to pages with origin chrome-search://most-visited and
@@ skipping 1039 matching lines @@
   if (!render_view)
     return v8::Undefined();
   DVLOG(1) << render_view << " GetMostVisitedItems";
 
   const SearchBox* search_box = SearchBox::Get(render_view);
 
   std::vector<InstantMostVisitedItemIDPair> instant_mv_items;
   search_box->GetMostVisitedItems(&instant_mv_items);
   v8::Handle<v8::Array> v8_mv_items = v8::Array::New(instant_mv_items.size());
   for (size_t i = 0; i < instant_mv_items.size(); ++i) {
-    v8_mv_items->Set(i, GenerateMostVisitedItem(instant_mv_items[i].first,
+    v8_mv_items->Set(i, GenerateMostVisitedItem(render_view->GetRoutingID(),
+                                                instant_mv_items[i].first,
                                                 instant_mv_items[i].second));
   }
   return v8_mv_items;
 }
 
 // static
 v8::Handle<v8::Value> SearchBoxExtensionWrapper::DeleteMostVisitedItem(
     const v8::Arguments& args) {
   content::RenderView* render_view = GetRenderView();
   if (!render_view || !args.Length()) return v8::Undefined();
@@ skipping 128 matching lines @@
   if (args.Length() < 1 || !args[0]->IsNumber())
     return v8::Undefined();
 
   DVLOG(1) << render_view << " GetMostVisitedItem";
   InstantRestrictedID restricted_id = args[0]->IntegerValue();
   InstantMostVisitedItem mv_item;
   if (!SearchBox::Get(render_view)->GetMostVisitedItemWithID(
           restricted_id, &mv_item)) {
     return v8::Undefined();
   }
-  return GenerateMostVisitedItem(restricted_id, mv_item);
+  return GenerateMostVisitedItem(render_view->GetRoutingID(), restricted_id,
+                                 mv_item);
 }
 
 // static
 v8::Handle<v8::Value> SearchBoxExtensionWrapper::IsFocused(
     const v8::Arguments& args) {
   content::RenderView* render_view = GetRenderView();
   if (!render_view) return v8::Undefined();
 
   bool is_focused = SearchBox::Get(render_view)->is_focused();
   DVLOG(1) << render_view << " IsFocused: " << is_focused;
@@ skipping 70 matching lines @@
   Dispatch(frame, kDispatchFocusChangedScript);
 }
 
 // static
 void SearchBoxExtension::DispatchToggleVoiceSearch(
     WebKit::WebFrame* frame) {
   Dispatch(frame, kDispatchToggleVoiceSearchScript);
 }
 
 }  // namespace extensions_v8