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

chrome/renderer/searchbox/searchbox.cc

 // 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.
 
 #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"
 
 SearchBox::SearchBox(content::RenderView* render_view)
     : content::RenderViewObserver(render_view),
       content::RenderViewObserverTracker<SearchBox>(render_view),
       verbatim_(false),
       selection_start_(0),
       selection_end_(0),
       results_base_(0),
+      start_margin_(0),
+      end_margin_(0),
       last_results_base_(0),
       theme_area_height_(0),
       display_instant_results_(false) {
 }
 
 SearchBox::~SearchBox() {
 }
 
 void SearchBox::SetSuggestions(
     const std::vector<InstantSuggestion>& suggestions) {
   if (!suggestions.empty() &&
       suggestions[0].behavior == INSTANT_COMPLETE_REPLACE) {
     query_ = suggestions[0].text;
     verbatim_ = true;
     selection_start_ = selection_end_ = query_.size();
   }
   // Explicitly allow empty vector to be sent to the browser.
   render_view()->Send(new ChromeViewHostMsg_SetSuggestions(
       render_view()->GetRoutingID(), render_view()->GetPageId(), suggestions));
 }
 
 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));
+int SearchBox::GetStartMargin() const {
+  return static_cast<int>(start_margin_ / GetZoom());
+}
+
+int SearchBox::GetEndMargin() const {
+  return static_cast<int>(end_margin_ / GetZoom());
+}
+
+gfx::Rect SearchBox::GetPopupBounds() const {
+  double zoom = GetZoom();
+  return gfx::Rect(static_cast<int>(popup_bounds_.x() / zoom),
+                   static_cast<int>(popup_bounds_.y() / zoom),
+                   static_cast<int>(popup_bounds_.width() / zoom),
+                   static_cast<int>(popup_bounds_.height() / zoom));
 }
 
 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_;
@@ skipping 14 matching lines @@
 int SearchBox::GetThemeAreaHeight() {
   return theme_area_height_;
 }
 
 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_SearchBoxMarginChange, OnMarginChange)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_DetermineIfPageSupportsInstant,
                         OnDetermineIfPageSupportsInstant)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxAutocompleteResults,
                         OnAutocompleteResults)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxUpOrDownKeyPressed,
                         OnUpOrDownKeyPressed)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxModeChanged,
                         OnModeChanged)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxSetDisplayInstantResults,
                         OnSetDisplayInstantResults)
@@ skipping 38 matching lines @@
   verbatim_ = true;
   selection_start_ = selection_end_ = query_.size();
   if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
     DVLOG(1) << render_view() << " OnCancel";
     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()) {
     DVLOG(1) << render_view() << " OnResize";

[sreeram, 2012/12/05 00:14:46]

Nit: OnResize -> OnPopupResize

[melevin, 2012/12/06 23:13:00]

Done.

     extensions_v8::SearchBoxExtension::DispatchResize(
         render_view()->GetWebView()->mainFrame());
   }
 }
 
+void SearchBox::OnMarginChange(int start, int end) {
+  start_margin_ = start;
+  end_margin_ = end;
+  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());
     DVLOG(1) << render_view() << " PageSupportsInstant: " << result;
     render_view()->Send(new ChromeViewHostMsg_InstantSupportDetermined(
         render_view()->GetRoutingID(), render_view()->GetPageId(), result));
   }
 }
 
@@ skipping 38 matching lines @@
 }
 
 void SearchBox::OnThemeAreaHeightChanged(int height) {
   theme_area_height_ = height;
   if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
     extensions_v8::SearchBoxExtension::DispatchThemeAreaHeightChange(
         render_view()->GetWebView()->mainFrame());
   }
 }
 
+double SearchBox::GetZoom() const {
+  WebKit::WebView* web_view = render_view()->GetWebView();
+  if (web_view) {
+    double zoom = WebKit::WebView::zoomLevelToZoomFactor(web_view->zoomLevel());
+    if (zoom != 0)
+      return zoom;
+  }
+  return 1.0;
+}
+
 void SearchBox::Reset() {
   query_.clear();
   verbatim_ = false;
   selection_start_ = 0;
   selection_end_ = 0;
   results_base_ = 0;
-  rect_ = gfx::Rect();
+  popup_bounds_ = gfx::Rect();
+  start_margin_ = 0;
+  end_margin_ = 0;
   autocomplete_results_.clear();
   mode_ = chrome::search::Mode();
   theme_info_ = ThemeBackgroundInfo();
   theme_area_height_ = 0;
   display_instant_results_ = false;
 }