X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fcontent%2Frenderer%2Faccessibility%2Frenderer_accessibility_complete.cc;h=be1cde8418753012d1ee65d38d1c5dc4a35c93ae;hb=4a1a0bdd01eef90b0826a0e761d3379d3715c10f;hp=e7765d4673e5af509c58a5cdbba4516e6d6aed1e;hpb=b1be5ca53587d23e7aeb77b26861fdc0a181ffd8;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/content/renderer/accessibility/renderer_accessibility_complete.cc b/src/content/renderer/accessibility/renderer_accessibility_complete.cc index e7765d4..be1cde8 100644 --- a/src/content/renderer/accessibility/renderer_accessibility_complete.cc +++ b/src/content/renderer/accessibility/renderer_accessibility_complete.cc @@ -9,6 +9,7 @@ #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" @@ -28,10 +29,10 @@ 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) { @@ -91,13 +92,6 @@ void RendererAccessibilityComplete::FocusedNodeChanged(const WebNode& node) { } } -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)); @@ -162,7 +156,7 @@ void RendererAccessibilityComplete::SendPendingAccessibilityEvents() { if (pending_events_.empty()) return; - if (render_view_->is_swapped_out()) + if (render_frame_->is_swapped_out()) return; ack_pending_ = true; @@ -406,7 +400,7 @@ void RendererAccessibilityComplete::OnSetFocus(int acc_obj_id) { // 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); }