Add RenderFrameObserver::FocusedNodeChanged

content/renderer/render_view_impl.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 "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 1890 matching lines @@
 }
 
 void RenderViewImpl::focusNext() {
   Send(new ViewHostMsg_TakeFocus(routing_id_, false));
 }
 
 void RenderViewImpl::focusPrevious() {
   Send(new ViewHostMsg_TakeFocus(routing_id_, true));
 }
 
-void RenderViewImpl::focusedNodeChanged(const WebNode& node) {
+void RenderViewImpl::focusedNodeChanged(const WebNode& previouslyFocusedNode,
+                                        const WebNode& focusedNode) {
   has_scrolled_focused_editable_node_into_rect_ = false;
 
   gfx::Rect node_bounds;
-  if (!node.isNull() && node.isElementNode()) {
-    WebNode web_node = const_cast<WebNode&>(node);
+  if (!focusedNode.isNull() && focusedNode.isElementNode()) {
+    WebNode web_node = const_cast<WebNode&>(focusedNode);
     node_bounds = gfx::Rect(web_node.to<WebElement>().boundsInViewportSpace());
   }
-  Send(new ViewHostMsg_FocusedNodeChanged(routing_id_, IsEditableNode(node),
-                                          node_bounds));
+  Send(new ViewHostMsg_FocusedNodeChanged(
+      routing_id_, IsEditableNode(focusedNode), node_bounds));
 
-  FOR_EACH_OBSERVER(RenderViewObserver, observers_, FocusedNodeChanged(node));
+  // TODO(estade): remove.
+  FOR_EACH_OBSERVER(RenderViewObserver, observers_,
+                    FocusedNodeChanged(focusedNode));
 
-  // TODO(dmazzoni): this should be part of RenderFrameObserver.
-  GetMainRenderFrame()->FocusedNodeChanged(node);
+  RenderFrameImpl* previous_frame = nullptr;
+  if (!previouslyFocusedNode.isNull()) {
+    previous_frame =
+        RenderFrameImpl::FromWebFrame(previouslyFocusedNode.document().frame());
+  }
+  RenderFrameImpl* new_frame = nullptr;
+  if (!focusedNode.isNull()) {

[nasko, 2015/01/20 05:09:51]

nit: no need for {}

[Evan Stade, 2015/01/20 22:31:01]

Done.

+    new_frame = RenderFrameImpl::FromWebFrame(focusedNode.document().frame());
+  }
+
+  if (previous_frame && previous_frame != new_frame)
+    previous_frame->FocusedNodeChanged(WebNode());
+  if (new_frame)
+    new_frame->FocusedNodeChanged(focusedNode);
+
+  // TODO(dmazzoni): remove once there's a separate a11y tree per frame.
+  GetMainRenderFrame()->FocusedNodeChangedForAccessibility(focusedNode);
 }
 
 void RenderViewImpl::didUpdateLayout() {
   FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidUpdateLayout());
 
   // We don't always want to set up a timer, only if we've been put in that
   // mode by getting a |ViewMsg_EnablePreferredSizeChangedMode|
   // message.
   if (!send_preferred_size_changes_ || !webview())
     return;
@@ skipping 2164 matching lines @@
     std::vector<gfx::Size> sizes;
     ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
     if (!url.isEmpty())
       urls.push_back(
           FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
   }
   SendUpdateFaviconURL(urls);
 }
 
 }  // namespace content