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 <vector>
 
 #include "base/command_line.h"
 #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"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/content_settings_pattern.h"
 #include "chrome/common/extensions/api/extension_action/page_action_handler.h"
 #include "chrome/common/extensions/background_info.h"
@@ skipping 187 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 751 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());
+    // 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;
 }
 
 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 207 matching lines @@
       return true;
   }
 
   if (request_os_file_handle_allowed_hosts_.count(inner.host()))
     return true;
 
   return false;
 }
 
 }  // namespace chrome