Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / content / renderer / accessibility / renderer_accessibility_focus_only.cc

diff --git a/src/content/renderer/accessibility/renderer_accessibility_focus_only.cc b/src/content/renderer/accessibility/renderer_accessibility_focus_only.cc
index 651b30b..bda3e8f 100644 (file)
--- a/src/content/renderer/accessibility/renderer_accessibility_focus_only.cc
+++ b/src/content/renderer/accessibility/renderer_accessibility_focus_only.cc
@@ -7,14 +7,13 @@
 #include "content/renderer/render_view_impl.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebElement.h"
-#include "third_party/WebKit/public/web/WebFrame.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_node_data.h"
 
 using blink::WebDocument;
 using blink::WebElement;
-using blink::WebFrame;
 using blink::WebNode;
 using blink::WebView;
 
@@ -49,7 +48,8 @@ void RendererAccessibilityFocusOnly::FocusedNodeChanged(const WebNode& node) {
   HandleFocusedNodeChanged(node, true);
 }
 
-void RendererAccessibilityFocusOnly::DidFinishLoad(blink::WebFrame* frame) {
+void RendererAccessibilityFocusOnly::DidFinishLoad(
+    blink::WebLocalFrame* frame) {
   WebView* view = render_view()->GetWebView();
   if (view->focusedFrame() != frame)
     return;
@@ -97,9 +97,9 @@ void RendererAccessibilityFocusOnly::HandleFocusedNodeChanged(
   // has focus, otherwise the focused node.
   event.id = node_has_focus ? next_id_ : 1;
 
-  event.nodes.resize(2);
-  ui::AXNodeData& root = event.nodes[0];
-  ui::AXNodeData& child = event.nodes[1];
+  event.update.nodes.resize(2);
+  ui::AXNodeData& root = event.update.nodes[0];
+  ui::AXNodeData& child = event.update.nodes[1];
 
   // Always include the root of the tree, the document. It always has id 1.
   root.id = 1;