Updating PageClickTracker to Notify listeners When Text Input Loses Focus.

chrome/renderer/page_click_tracker.cc

 // Copyright (c) 2011 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/page_click_tracker.h"
 
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/page_click_listener.h"
 #include "content/public/renderer/render_view.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
@@ skipping 61 matching lines @@
   if (input_element.isNull())
     return;
 
   bool is_focused = (last_node_clicked_ == render_view()->GetFocusedNode());
   ObserverListBase<PageClickListener>::Iterator it(listeners_);
   PageClickListener* listener;
   while ((listener = it.GetNext()) != NULL) {
     if (listener->InputElementClicked(input_element, was_focused_, is_focused))
       break;
   }
-
-  last_node_clicked_.reset();
 }
 
 void PageClickTracker::AddListener(PageClickListener* listener) {
   listeners_.AddObserver(listener);
 }
 
 void PageClickTracker::RemoveListener(PageClickListener* listener) {
   listeners_.RemoveObserver(listener);
 }
 
 void PageClickTracker::DidFinishDocumentLoad(WebKit::WebFrame* frame) {
   tracked_frames_.push_back(frame);
   frame->document().addEventListener("mousedown", this, false);
 }
 
 void PageClickTracker::FrameDetached(WebKit::WebFrame* frame) {
   FrameList::iterator iter =
       std::find(tracked_frames_.begin(), tracked_frames_.end(), frame);
   if (iter == tracked_frames_.end()) {
     // Some frames might never load contents so we may not have a listener on
     // them.  Calling removeEventListener() on them would trigger an assert, so
     // we need to keep track of which frames we are listening to.
     return;
   }
   tracked_frames_.erase(iter);
 }
 
 void PageClickTracker::handleEvent(const WebDOMEvent& event) {
-  last_node_clicked_.reset();

[Ilya Sherman, 2011/10/27 22:04:17]

I think you might want to leave this in place.  Otherwise, I'm worried that
right clicks might trigger calls to InputElementClicked(), or something like
that.

[csharp, 2011/10/31 15:24:25]

Done.

-
   if (!event.isMouseEvent())
     return;
 
   const WebDOMMouseEvent mouse_event = event.toConst<WebDOMMouseEvent>();
   DCHECK(mouse_event.buttonDown());
   if (mouse_event.button() != 0)
     return;  // We are only interested in left clicks.
 
   // Remember which node has focus before the click is processed.
   // We'll get a notification once the mouse event has been processed
   // (DidHandleMouseEvent), we'll notify the listener at that point.
   WebNode node = mouse_event.target();
+
+  // The selected text field has lost focus.
+  if (DidSelectedTextFieldLoseFocus(node))
+    SelectedTextFieldLostFocus();

[Ilya Sherman, 2011/10/27 22:04:17]

nit: It might be cleaner to combine these two functions into a single one, named
something along the lines of CheckForSelectedFieldLosingFocus() (or something
more concise, if you have a better idea).

[csharp, 2011/10/31 15:24:25]

Done.

+
   // We are only interested in text field clicks.
-  if (GetTextWebInputElement(node).isNull())
+  if (GetTextWebInputElement(node).isNull()) {
+    last_node_clicked_.reset();
+
     return;
+  }
 
   last_node_clicked_ = node;
   was_focused_ = (render_view()->GetFocusedNode() == last_node_clicked_);

[Ilya Sherman, 2011/10/27 22:04:17]

nit: Just noticed this line, which uses |render_view()->GetFocusedNode()| rather
than |newly_clicked_node.document().focusedNode()|.  I think they're equivalent,
but we should probably pick one, for the sake of consistency.

[csharp, 2011/10/31 15:24:25]

Done.

 }
+
+void PageClickTracker::SelectedTextFieldLostFocus() {
+  ObserverListBase<PageClickListener>::Iterator it(listeners_);
+  PageClickListener* listener;
+  while ((listener = it.GetNext()) != NULL) {
+    if (listener->InputElementLostFocus())
+      break;
+  }
+}
+
+bool PageClickTracker::DidSelectedTextFieldLoseFocus(
+    WebKit::WebNode newly_clicked_node) {
+  WebKit::WebNode focused_node = newly_clicked_node.document().focusedNode();
+
+  if (focused_node.isNull() || GetTextWebInputElement(focused_node).isNull())
+    return false;
+
+  return focused_node != newly_clicked_node;
+}