partial PageClickTracker migration to RenderFrameObserver

components/autofill/content/renderer/page_click_tracker.cc

 // Copyright 2013 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 "components/autofill/content/renderer/page_click_tracker.h"
 
 #include "components/autofill/content/renderer/form_autofill_util.h"
 #include "components/autofill/content/renderer/page_click_listener.h"
+#include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_view.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebInputElement.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebTextAreaElement.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
 using blink::WebElement;
 using blink::WebGestureEvent;
@@ skipping 28 matching lines @@
   const WebElement element = node.toConst<WebElement>();
   if (!element.hasHTMLTagName("textarea"))
     return WebTextAreaElement();
   return element.toConst<WebTextAreaElement>();
 }
 
 }  // namespace
 
 namespace autofill {
 
-PageClickTracker::PageClickTracker(content::RenderView* render_view,
+PageClickTracker::PageClickTracker(content::RenderFrame* render_frame,
                                    PageClickListener* listener)
-    : content::RenderViewObserver(render_view),
+    : content::RenderFrameObserver(render_frame),
+      focused_node_was_last_clicked_(false),
       was_focused_before_now_(false),
-      listener_(listener) {
+      listener_(listener),
+      legacy_(this) {
 }
 
 PageClickTracker::~PageClickTracker() {
 }
 
 void PageClickTracker::OnDestruct() {
   // No-op. Don't delete |this|.
 }
 
 void PageClickTracker::DidHandleMouseEvent(const WebMouseEvent& event) {
@@ skipping 10 matching lines @@
     return;
 
   PotentialActivationAt(event.x, event.y);
 }
 
 void PageClickTracker::FocusedNodeChanged(const WebNode& node) {
   was_focused_before_now_ = false;
 }
 
 void PageClickTracker::FocusChangeComplete() {
-  if (!clicked_node_.isNull()) {
-    const WebInputElement input_element = GetTextWebInputElement(clicked_node_);
+  if (!focused_node_was_last_clicked_)
+    return;
+
+  blink::WebNode focused_node = render_frame()->GetFocusedElement();
+  if (!focused_node.isNull()) {
+    const WebInputElement input_element = GetTextWebInputElement(focused_node);
     if (!input_element.isNull()) {
       listener_->FormControlElementClicked(input_element,
                                            was_focused_before_now_);
     } else {
       const WebTextAreaElement textarea_element =
-          GetWebTextAreaElement(clicked_node_);
+          GetWebTextAreaElement(focused_node);
       if (!textarea_element.isNull()) {
         listener_->FormControlElementClicked(textarea_element,
                                              was_focused_before_now_);
       }
     }
   }
 
-  clicked_node_.reset();
   was_focused_before_now_ = true;
 }
 
 void PageClickTracker::PotentialActivationAt(int x, int y) {
-  WebElement focused_element = render_view()->GetFocusedElement();
+  focused_node_was_last_clicked_ = false;
+
+  blink::WebElement focused_element = render_frame()->GetFocusedElement();
   if (focused_element.isNull())
     return;
 
-  if (!GetScaledBoundingBox(render_view()->GetWebView()->pageScaleFactor(),
-                            &focused_element).Contains(x, y)) {
+  if (!GetScaledBoundingBox(
+           render_frame()->GetRenderView()->GetWebView()->pageScaleFactor(),
+           &focused_element).Contains(x, y)) {
     return;
   }
 
-  clicked_node_ = focused_element;
+  focused_node_was_last_clicked_ = true;
+}
+
+// PageClickTracker::Legacy ----------------------------------------------------
+
+PageClickTracker::Legacy::Legacy(PageClickTracker* tracker)
+    : content::RenderViewObserver(tracker->render_frame()->GetRenderView()),
+      tracker_(tracker) {
+}
+
+void PageClickTracker::Legacy::OnDestruct() {
+  // No-op. Don't delete |this|.
+}
+
+void PageClickTracker::Legacy::DidHandleMouseEvent(
+    const blink::WebMouseEvent& event) {
+  tracker_->DidHandleMouseEvent(event);
+}
+
+void PageClickTracker::Legacy::DidHandleGestureEvent(
+    const blink::WebGestureEvent& event) {
+  tracker_->DidHandleGestureEvent(event);
+}
+
+void PageClickTracker::Legacy::FocusChangeComplete() {
+  tracker_->FocusChangeComplete();
 }
 
 }  // namespace autofill