Fixing iframe jank in the local omnibox popup.

chrome/renderer/chrome_content_renderer_client.cc

 // Copyright (c) 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/chrome_content_renderer_client.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 203 matching lines @@
   // Treat CDM invocations like JavaScript.
   if (plugin.name == ASCIIToUTF16(kWidevineCdmPluginName)) {
     DCHECK(plugin.type == WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS);
     return true;
   }
 #endif  // WIDEVINE_CDM_AVAILABLE
 
   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 {
 
 ChromeContentRendererClient::ChromeContentRendererClient() {
 }
 
 ChromeContentRendererClient::~ChromeContentRendererClient() {
 }
 
@@ skipping 754 matching lines @@
   }
 
   if (url.SchemeIs(chrome::kExtensionResourceScheme) &&
       !extensions::ResourceRequestPolicy::CanRequestExtensionResourceScheme(
           url,
           frame)) {
     *new_url = GURL(chrome::kExtensionResourceInvalidRequestURL);
     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());
+    SetOriginForSuggestionRequest(url, top_url, new_url);
+    return true;
   }
 
   return false;
 }
 
 bool ChromeContentRendererClient::ShouldPumpEventsDuringCookieMessage() {
   // We no longer pump messages, even under Chrome Frame. We rely on cookie
   // read requests handled by CF not putting up UI or causing other actions
   // that would require us to pump messages. This fixes http://crbug.com/110090.
   return false;
@@ skipping 208 matching lines @@
   }
 
   for (size_t i = 0; i < request_os_file_handle_allowed_hosts_.size(); ++i) {
     if (MatchPattern(inner.host(), request_os_file_handle_allowed_hosts_[i]))
       return true;
   }
 
   return false;
 }
 
+void ChromeContentRendererClient::SetOriginForSuggestionRequest(
+    const GURL& url,
+    const GURL& top_url,
+    GURL *new_url) const {
+  // Note that this replaces any existing query string parameters, including
+  // any existing &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.

[palmer, 2013/04/09 00:26:15]

Does this mean that GURL.GetOrigin.spec has a bug?

[Jered, 2013/04/09 01:18:58]

No, spec() is intended to stringify URLs, not origins.

+  TrimString(query_str, "/", &query_str);
+  set_origin.SetQueryStr(query_str);
+  *new_url = url.ReplaceComponents(set_origin);

[brettw, 2013/04/08 23:16:42]

I'd just return the new one rather than using the out param, this makes the
syntax look much more natural.

[Jered, 2013/04/08 23:55:05]

Done.

[palmer, 2013/04/09 00:26:15]

Agreed.

[Jered, 2013/04/09 01:18:58]

Done.

+}
+
 }  // namespace chrome