Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(676)

Unified Diff: content/renderer/accessibility/renderer_accessibility_complete.cc

Issue 407493002: Revert of Migrate accessibility from RenderView to RenderFrame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/accessibility/renderer_accessibility_complete.cc
diff --git a/content/renderer/accessibility/renderer_accessibility_complete.cc b/content/renderer/accessibility/renderer_accessibility_complete.cc
index fd647187b3dbe88fb97b8cdc7a5e3bc3f854dbaa..2e72dde7fb93f06c9dc7286caa3fb991f9d2c826 100644
--- a/content/renderer/accessibility/renderer_accessibility_complete.cc
+++ b/content/renderer/accessibility/renderer_accessibility_complete.cc
@@ -9,7 +9,6 @@
#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"
@@ -29,10 +28,10 @@
namespace content {
RendererAccessibilityComplete::RendererAccessibilityComplete(
- RenderFrameImpl* render_frame)
- : RendererAccessibility(render_frame),
+ RenderViewImpl* render_view)
+ : RendererAccessibility(render_view),
weak_factory_(this),
- tree_source_(render_frame),
+ tree_source_(render_view),
serializer_(&tree_source_),
last_scroll_offset_(gfx::Size()),
ack_pending_(false) {
@@ -92,6 +91,13 @@
}
}
+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));
@@ -156,7 +162,7 @@
if (pending_events_.empty())
return;
- if (render_frame_->is_swapped_out())
+ if (render_view_->is_swapped_out())
return;
ack_pending_ = true;
@@ -381,7 +387,7 @@
// 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_frame_->GetRenderView()->GetWebView()->clearFocusedElement();
+ render_view()->GetWebView()->clearFocusedElement();
else
obj.setFocused(true);
}

Powered by Google App Engine
This is Rietveld 408576698