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 26 matching lines @@
   const WebElement element = node.toConst<WebElement>();
   if (!element.isFormControlElement())
     return WebInputElement();
   const WebFormControlElement control =
       element.toConst<WebFormControlElement>();
   if (control.formControlType() != WebString::fromUTF8("text"))
     return WebInputElement();
   return element.toConst<WebInputElement>();
 }
 
+// Checks to see if a text field was the previously selected node and is now
+// losing its focus.
+bool DidSelectedTextFieldLoseFocus(const 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;
+}
+
 }  // namespace
 
 PageClickTracker::PageClickTracker(content::RenderView* render_view)
     : content::RenderViewObserver(render_view),
       was_focused_(false) {
 }
 
 PageClickTracker::~PageClickTracker() {
   // Note that even though RenderView calls FrameDetached when notified that
   // a frame was closed, it might not always get that notification from WebKit
@@ skipping 15 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);
 }
 
@@ skipping 22 matching lines @@
 
   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();
+
+  HandleTextFieldMaybeLosingFocus(node);
+
   // We are only interested in text field clicks.
   if (GetTextWebInputElement(node).isNull())
     return;
 
   last_node_clicked_ = node;
-  was_focused_ = (render_view()->GetFocusedNode() == last_node_clicked_);
+  was_focused_ = (node.document().focusedNode() == last_node_clicked_);
 }
+
+void PageClickTracker::HandleTextFieldMaybeLosingFocus(
+    const WebNode& newly_clicked_node) {
+  if (!DidSelectedTextFieldLoseFocus(newly_clicked_node))
+    return;
+
+  ObserverListBase<PageClickListener>::Iterator it(listeners_);
+  PageClickListener* listener;
+  while ((listener = it.GetNext()) != NULL) {
+    if (listener->InputElementLostFocus())
+      break;
+  }
+}