Implement the Instant extended API startMargin, endMargin, and rtl properties and the onmarginchang…

chrome/renderer/searchbox/searchbox.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/searchbox/searchbox.h"
 
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/searchbox/searchbox_extension.h"
 #include "content/public/renderer/render_view.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
@@ skipping 27 matching lines @@
 }
 
 void SearchBox::ShowInstantPreview(InstantShownReason reason,
                                    int height,
                                    InstantSizeUnits units) {
   render_view()->Send(new ChromeViewHostMsg_ShowInstantPreview(
       render_view()->GetRoutingID(), render_view()->GetPageId(), reason,
       height, units));
 }
 
-gfx::Rect SearchBox::GetRect() {
-  // Need to adjust for scale.
-  if (rect_.IsEmpty())
-    return rect_;
-  WebKit::WebView* web_view = render_view()->GetWebView();
-  if (!web_view)
-    return rect_;
-  double zoom = WebKit::WebView::zoomLevelToZoomFactor(web_view->zoomLevel());
-  if (zoom == 0)
-    return rect_;
-  return gfx::Rect(static_cast<int>(static_cast<float>(rect_.x()) / zoom),
-                   static_cast<int>(static_cast<float>(rect_.y()) / zoom),
-                   static_cast<int>(static_cast<float>(rect_.width()) / zoom),
-                   static_cast<int>(static_cast<float>(rect_.height()) / zoom));
+gfx::Rect SearchBox::GetOmniboxBounds() {
+  return GetZoomedBounds(omnibox_bounds_);
+}
+
+gfx::Rect SearchBox::GetPopupBounds() {
+  return GetZoomedBounds(popup_bounds_);
 }
 
 const std::vector<InstantAutocompleteResult>&
     SearchBox::GetAutocompleteResults() {
   // Remember the last requested autocomplete_results to account for race
   // conditions between autocomplete providers returning new data and the user
   // clicking on a suggestion.
   last_autocomplete_results_ = autocomplete_results_;
   last_results_base_ = results_base_;
   return autocomplete_results_;
 }
 
 const InstantAutocompleteResult* SearchBox::GetAutocompleteResultWithId(
     size_t restricted_id) const {
   if (restricted_id < last_results_base_ ||
       restricted_id >= last_results_base_ + last_autocomplete_results_.size())
     return NULL;
   return &last_autocomplete_results_[restricted_id - last_results_base_];
 }
 
 bool SearchBox::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(SearchBox, message)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxChange, OnChange)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxSubmit, OnSubmit)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxCancel, OnCancel)
-    IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxResize, OnResize)
+    IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxPopupResize, OnPopupResize)
+    IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxOmniboxResize, OnOmniboxResize)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_DetermineIfPageSupportsInstant,
                         OnDetermineIfPageSupportsInstant)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxAutocompleteResults,
                         OnAutocompleteResults)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxUpOrDownKeyPressed,
                         OnUpOrDownKeyPressed)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxFocus, OnFocus)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxBlur, OnBlur)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxActiveTabModeChanged,
                         OnActiveTabModeChanged)
@@ skipping 31 matching lines @@
   query_ = query;
   verbatim_ = true;
   selection_start_ = selection_end_ = query_.size();
   if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
     extensions_v8::SearchBoxExtension::DispatchCancel(
         render_view()->GetWebView()->mainFrame());
   }
   Reset();
 }
 
-void SearchBox::OnResize(const gfx::Rect& bounds) {
-  rect_ = bounds;
+void SearchBox::OnPopupResize(const gfx::Rect& bounds) {
+  popup_bounds_ = bounds;
   if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
     extensions_v8::SearchBoxExtension::DispatchResize(
         render_view()->GetWebView()->mainFrame());
   }
 }
 
+void SearchBox::OnOmniboxResize(const gfx::Rect& bounds) {
+  omnibox_bounds_ = bounds;
+
+  // The omnibox bounds are used to compute the Instant page side margins.
+  if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
+    extensions_v8::SearchBoxExtension::DispatchMarginChange(
+        render_view()->GetWebView()->mainFrame());
+  }
+}
+
 void SearchBox::OnDetermineIfPageSupportsInstant() {
   if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
     bool result = extensions_v8::SearchBoxExtension::PageSupportsInstant(
         render_view()->GetWebView()->mainFrame());
     render_view()->Send(new ChromeViewHostMsg_InstantSupportDetermined(
         render_view()->GetRoutingID(), render_view()->GetPageId(), result));
   }
 }
 
 void SearchBox::OnAutocompleteResults(
@@ skipping 35 matching lines @@
     extensions_v8::SearchBoxExtension::DispatchContextChange(
         render_view()->GetWebView()->mainFrame());
   }
 }
 
 void SearchBox::Reset() {
   query_.clear();
   verbatim_ = false;
   selection_start_ = selection_end_ = 0;
   results_base_ = 0;
-  rect_ = gfx::Rect();
+  popup_bounds_ = gfx::Rect();
+  omnibox_bounds_ = gfx::Rect();
   autocomplete_results_.clear();
   is_focused_ = false;
 }
+
+// Returns the input |bounds| rect scaled by the current zoom level.
+gfx::Rect SearchBox::GetZoomedBounds(const gfx::Rect bounds) {
+  if (!bounds.IsEmpty()) {
+    WebKit::WebView* web_view = render_view()->GetWebView();
+    if (web_view) {
+      double zoom =
+          WebKit::WebView::zoomLevelToZoomFactor(web_view->zoomLevel());
+      if (zoom != 0) {
+        return gfx::Rect(static_cast<int>(bounds.x() / zoom),
+                         static_cast<int>(bounds.y() / zoom),
+                         static_cast<int>(bounds.width() / zoom),
+                         static_cast<int>(bounds.height() / zoom));
+      }
+    }
+  }
+  return bounds;
+}