Fixing iframe jank in the local omnibox popup.

chrome/renderer/resources/extensions/searchbox_api.js

 // 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.
 
 var chrome;
 if (!chrome)
   chrome = {};
 
 if (!chrome.embeddedSearch) {
   chrome.embeddedSearch = new function() {
@@ skipping 76 matching lines @@
       // =======================================================================
       native function GetQuery();
       native function GetVerbatim();
       native function GetSelectionStart();
       native function GetSelectionEnd();
       native function GetStartMargin();
       native function GetRightToLeft();
       native function GetAutocompleteResults();
       native function GetDisplayInstantResults();
       native function GetFontSize();
-      native function GetSuggestionIframeURLPrefix();
       native function IsKeyCaptureEnabled();
       native function SetQuery();
       native function SetQueryFromAutocompleteResult();
       native function SetSuggestion();
       native function SetSuggestionFromAutocompleteResult();
       native function SetSuggestions();
       native function ShowOverlay();
       native function FocusOmnibox();
       native function StartCapturingKeyStrokes();
       native function StopCapturingKeyStrokes();
-      native function SetSuggestionStyle();
       native function NavigateSearchBox();
       native function ShowBars();
       native function HideBars();
-      native function ShouldUseIframes();
+      native function GetSuggestionData();
 
       function SafeWrapSuggestion(restrictedText) {
         return SafeWrap(restrictedText, 22);
       }
 
       // If shadowDom is to be used, wraps the AutocompleteResult query and URL
       // into ShadowDOM nodes so that the JS cannot access them and deletes the
       // raw values. Else if iframes are to be used, replaces the
       // destination_url with the chrome search URL that should be used as the
       // iframe.
       // TODO(shishir): Remove code to support ShadowDOM once server side
       // changes are live.
       function GetAutocompleteResultsWrapper() {
         var autocompleteResults = DedupeAutocompleteResults(
             GetAutocompleteResults());
         var userInput = GetQuery();
         for (var i = 0, result; result = autocompleteResults[i]; ++i) {
-          if (ShouldUseIframes()) {
-            result.destination_url = GetSuggestionIframeURLPrefix() +
-                result.rid;
-          } else {
-            // TODO(shishir): Fix the naming violations (chrome_search ->
-            // chrome-search etc) when the server supports both names.
-            var className = result.is_search ? 'chrome_search' : 'chrome_url';
-            var combinedElement = '<span class=' + className + '>' +
-                escapeHTML(result.contents) + '</span>';
-            if (result.description) {
-              combinedElement +=
-                  '<span class=chrome_separator> &ndash; </span>' +
-                  '<span class=chrome_title>' +
-                  escapeHTML(result.description) + '</span>';
-            }
-            result.combinedNode = SafeWrapSuggestion(combinedElement);
-            result.destination_url = null;
+          // TODO(shishir): Fix the naming violations (chrome_search ->
+          // chrome-search etc) when the server supports both names.
+          var className = result.is_search ? 'chrome_search' : 'chrome_url';
+          var combinedElement = '<span class=' + className + '>' +
+              escapeHTML(result.contents) + '</span>';
+          if (result.description) {
+            combinedElement +=
+                '<span class=chrome_separator> &ndash; </span>' +
+                '<span class=chrome_title>' +
+                escapeHTML(result.description) + '</span>';
           }
+          result.combinedNode = SafeWrapSuggestion(combinedElement);
+          result.destination_url = null;
           result.contents = null;
           result.description = null;
         }
         return autocompleteResults;
       }
 
       // TODO(dcblack): Do this in C++ instead of JS.
       function CanonicalizeUrl(url) {
         return url.replace(HTTP_REGEX, '').replace(WWW_REGEX, '');
       }
@@ skipping 75 matching lines @@
       this.__defineGetter__('selectionStart', GetSelectionStart);
       this.__defineGetter__('selectionEnd', GetSelectionEnd);
       this.__defineGetter__('startMargin', GetStartMargin);
       this.__defineGetter__('rtl', GetRightToLeft);
       this.__defineGetter__('nativeSuggestions', GetAutocompleteResultsWrapper);
       this.__defineGetter__('isKeyCaptureEnabled', IsKeyCaptureEnabled);
       this.__defineGetter__('displayInstantResults', GetDisplayInstantResults);
       this.__defineGetter__('font', GetFont);
       this.__defineGetter__('fontSize', GetFontSize);
 
+      // This method is restricted to chrome-search://suggestion pages by
+      // checking the invoking context's origin in searchbox_extension.cc.
+      this.getSuggestionData = function(restrictedId) {
+        return GetSuggestionData(restrictedId);
+      };

[sreeram, 2013/04/16 18:23:16]

Nit: Add a blank line after this method, to make it clear that the restriction
is only for this method and not for the following ones.

[Jered, 2013/04/16 20:12:49]

Done.

       this.setSuggestions = function(text) {
         SetSuggestions(text);
       };
       this.setAutocompleteText = function(text, behavior) {
         SetSuggestion(text, behavior);
       };
       this.setRestrictedAutocompleteText = function(autocompleteResultId) {
         SetSuggestionFromAutocompleteResult(autocompleteResultId);
       };
       this.setValue = function(text, type) {
@@ skipping 11 matching lines @@
       };
       this.focus = function() {
         FocusOmnibox();
       };
       this.startCapturingKeyStrokes = function() {
         StartCapturingKeyStrokes();
       };
       this.stopCapturingKeyStrokes = function() {
         StopCapturingKeyStrokes();
       };
-      this.setSuggestionStyle = function(url_color, title_color) {
-        SetSuggestionStyle(url_color, title_color);
-      };
       this.navigateContentWindow = function(destination, disposition) {
         NavigateSearchBox(destination, disposition);
       }
       this.showBars = function() {
         ShowBars();
       };
       this.hideBars = function() {
         HideBars();
       };
       this.onchange = null;
@@ skipping 69 matching lines @@
 
       this.onmostvisitedchange = null;
       this.onthemechange = null;
     };
 
     // Export legacy searchbox API.
     // TODO: Remove this when Instant Extended is fully launched.
     chrome.searchBox = this.searchBox;
   };
 }