Revert of Revert of Migrate accessibility from RenderView to RenderFrame.

content/renderer/accessibility/renderer_accessibility_complete.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/accessibility/renderer_accessibility_complete.h"
 
 #include <queue>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "content/renderer/accessibility/blink_ax_enum_conversion.h"
+#include "content/renderer/render_frame_impl.h"
 #include "content/renderer/render_view_impl.h"
 #include "third_party/WebKit/public/web/WebAXObject.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebInputElement.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebNode.h"
 #include "third_party/WebKit/public/web/WebView.h"
 #include "ui/accessibility/ax_tree.h"
 
 using blink::WebAXObject;
 using blink::WebDocument;
 using blink::WebNode;
 using blink::WebPoint;
 using blink::WebRect;
 using blink::WebView;
 
 namespace content {
 
 RendererAccessibilityComplete::RendererAccessibilityComplete(
-    RenderViewImpl* render_view)
-    : RendererAccessibility(render_view),
+    RenderFrameImpl* render_frame)
+    : RendererAccessibility(render_frame),
       weak_factory_(this),
-      tree_source_(render_view),
+      tree_source_(render_frame),
       serializer_(&tree_source_),
       last_scroll_offset_(gfx::Size()),
       ack_pending_(false) {
   WebAXObject::enableAccessibility();
 
 #if !defined(OS_ANDROID)
   // Skip inline text boxes on Android - since there are no native Android
   // APIs that compute the bounds of a range of text, it's a waste to
   // include these in the AX tree.
   WebAXObject::enableInlineTextBoxAccessibility();
@@ skipping 39 matching lines @@
   if (document.isNull())
     return;
 
   if (node.isNull()) {
     // When focus is cleared, implicitly focus the document.
     // TODO(dmazzoni): Make Blink send this notification instead.
     HandleAXEvent(document.accessibilityObject(), ui::AX_EVENT_BLUR);
   }
 }
 
-void RendererAccessibilityComplete::DidFinishLoad(blink::WebLocalFrame* frame) {
-  const WebDocument& document = GetMainDocument();
-  if (document.isNull())
-    return;
-}
-
-
 void RendererAccessibilityComplete::HandleWebAccessibilityEvent(
     const blink::WebAXObject& obj, blink::WebAXEvent event) {
   HandleAXEvent(obj, AXEventFromBlink(event));
 }
 
 void RendererAccessibilityComplete::HandleAXEvent(
     const blink::WebAXObject& obj, ui::AXEvent event) {
   const WebDocument& document = GetMainDocument();
   if (document.isNull())
     return;
@@ skipping 44 matching lines @@
 }
 
 void RendererAccessibilityComplete::SendPendingAccessibilityEvents() {
   const WebDocument& document = GetMainDocument();
   if (document.isNull())
     return;
 
   if (pending_events_.empty())
     return;
 
-  if (render_view_->is_swapped_out())
+  if (render_frame_->is_swapped_out())
     return;
 
   ack_pending_ = true;
 
   // Make a copy of the events, because it's possible that
   // actions inside this loop will cause more events to be
   // queued up.
   std::vector<AccessibilityHostMsg_EventParams> src_events =
       pending_events_;
   pending_events_.clear();
@@ skipping 204 matching lines @@
   if (root.isDetached()) {
 #ifndef NDEBUG
     LOG(WARNING) << "OnSetAccessibilityFocus but root is invalid";
 #endif
     return;
   }
 
   // By convention, calling SetFocus on the root of the tree should clear the
   // current focus. Otherwise set the focus to the new node.
   if (acc_obj_id == root.axID())
-    render_view()->GetWebView()->clearFocusedElement();
+    render_frame_->GetRenderView()->GetWebView()->clearFocusedElement();
   else
     obj.setFocused(true);
 }
 
 void RendererAccessibilityComplete::OnFatalError() {
   CHECK(false) << "Invalid accessibility tree.";
 }
 
 }  // namespace content