Fixing iframe jank in the local omnibox popup.

chrome/renderer/chrome_content_renderer_client.cc

Index: chrome/renderer/chrome_content_renderer_client.cc
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index 5e5cde70c3870c673974223c64f9d979c43e7ec5..4760229ba7d7d0893a8c1dabee5e2029189fe291 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -11,6 +11,7 @@
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
+#include "base/string_util.h"
 #include "base/strings/string_tokenizer.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
@@ -218,15 +219,6 @@ bool ShouldUseJavaScriptSettingForPlugin(const WebPluginInfo& plugin) {
   return false;
 }
 
-content::RenderView* GetRenderViewFromWebFrame(WebKit::WebFrame* webframe) {
-  if (!webframe)
-    return NULL;
-  WebKit::WebView* webview = webframe->view();
-  if (!webview)
-    return NULL;
-  return content::RenderView::FromWebView(webview);
-}
-
 }  // namespace
 
 namespace chrome {
@@ -998,13 +990,19 @@ bool ChromeContentRendererClient::WillSendRequest(
     return true;
   }
 
-  const content::RenderView* render_view = GetRenderViewFromWebFrame(frame);
-  if (SearchBox* search_box = SearchBox::Get(render_view)) {
-    if (url.SchemeIs(chrome::kChromeSearchScheme) &&
-        url.host() == chrome::kChromeSearchSuggestionHost) {
-      if (search_box->GenerateDataURLForSuggestionRequest(url, new_url))
-        return true;
-    }
+  if (url.SchemeIs(chrome::kChromeSearchScheme) &&
+      url.host() == chrome::kChromeSearchSuggestionHost) {
+    GURL top_url(frame->top()->document().url());
+    // Note that this replaces any existing parameters, including any existing

[palmer, 2013/04/05 01:30:32]

"...any existing URL query string parameters..." (took me an additional
microsecond to figure out what kind of parameter you meant).

And why should the consumer of this URL believe this new origin parameter
instead of any other one?

Might this break something somewhere that needed a parameter named origin?

[Jered, 2013/04/05 15:30:23]

Done.
Because this origin is interpolated and checked as the allowed origin for
postMessage().
Yes, but there is no such place.

+    // &origin parameter.
+    GURL::Replacements set_origin;
+    std::string query_str = "origin=";
+    query_str.append(top_url.GetOrigin().spec());
+    // Origin should not include a trailing slash. That is part of the path.
+    TrimString(query_str, "/", &query_str);
+    set_origin.SetQueryStr(query_str);
+    *new_url = url.ReplaceComponents(set_origin);
+    return true;
   }
 
   return false;