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

Unified Diff: trunk/src/content/renderer/accessibility/blink_ax_tree_source.cc

Issue 408663006: Revert 284065 "Revert of Revert of Migrate accessibility from Re..." (Closed) Base URL: svn://svn.chromium.org/chrome/
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: trunk/src/content/renderer/accessibility/blink_ax_tree_source.cc
===================================================================
--- trunk/src/content/renderer/accessibility/blink_ax_tree_source.cc (revision 284469)
+++ trunk/src/content/renderer/accessibility/blink_ax_tree_source.cc (working copy)
@@ -10,7 +10,6 @@
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.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/platform/WebRect.h"
#include "third_party/WebKit/public/platform/WebSize.h"
@@ -33,7 +32,6 @@
using blink::WebDocument;
using blink::WebDocumentType;
using blink::WebElement;
-using blink::WebFrame;
using blink::WebLocalFrame;
using blink::WebNode;
using blink::WebVector;
@@ -95,8 +93,8 @@
} // Anonymous namespace
-BlinkAXTreeSource::BlinkAXTreeSource(RenderFrameImpl* render_frame)
- : render_frame_(render_frame) {
+BlinkAXTreeSource::BlinkAXTreeSource(RenderViewImpl* render_view)
+ : render_view_(render_view) {
}
BlinkAXTreeSource::~BlinkAXTreeSource() {
@@ -552,11 +550,13 @@
}
blink::WebDocument BlinkAXTreeSource::GetMainDocument() const {
- WebView* view = render_frame_->render_view()->GetWebView();
- WebFrame* main_frame = view ? view->mainFrame() : NULL;
+ WebView* view = render_view_->GetWebView();
+ WebLocalFrame* main_frame =
+ view ? view->mainFrame()->toWebLocalFrame() : NULL;
if (main_frame)
return main_frame->document();
+
return WebDocument();
}

Powered by Google App Engine
This is Rietveld 408576698