Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / content / browser / accessibility / accessibility_tree_formatter.cc

diff --git a/src/content/browser/accessibility/accessibility_tree_formatter.cc b/src/content/browser/accessibility/accessibility_tree_formatter.cc
index 999476f..cca61a5 100644 (file)
--- a/src/content/browser/accessibility/accessibility_tree_formatter.cc
+++ b/src/content/browser/accessibility/accessibility_tree_formatter.cc
@@ -11,7 +11,7 @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
-#include "content/port/browser/render_widget_host_view_port.h"
+#include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 
@@ -31,7 +31,7 @@ AccessibilityTreeFormatter::AccessibilityTreeFormatter(
 // static
 AccessibilityTreeFormatter* AccessibilityTreeFormatter::Create(
     RenderViewHost* rvh) {
-  RenderWidgetHostViewPort* host_view = static_cast<RenderWidgetHostViewPort*>(
+  RenderWidgetHostViewBase* host_view = static_cast<RenderWidgetHostViewBase*>(
       WebContents::FromRenderViewHost(rvh)->GetRenderWidgetHostView());
 
   BrowserAccessibilityManager* manager =
@@ -68,7 +68,7 @@ void AccessibilityTreeFormatter::RecursiveBuildAccessibilityTree(
   dict->Set(kChildrenDictAttr, children);
 
   for (size_t i = 0; i < node.PlatformChildCount(); ++i) {
-    BrowserAccessibility* child_node = node.children()[i];
+    BrowserAccessibility* child_node = node.InternalGetChild(i);
     base::DictionaryValue* child_dict = new base::DictionaryValue;
     children->Append(child_dict);
     RecursiveBuildAccessibilityTree(*child_node, child_dict);
@@ -92,11 +92,10 @@ void AccessibilityTreeFormatter::RecursiveFormatAccessibilityTree(
   }
 }
 
-#if (!defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && \
-     !defined(TOOLKIT_GTK))
+#if (!defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_ANDROID))
 void AccessibilityTreeFormatter::AddProperties(const BrowserAccessibility& node,
                                                base::DictionaryValue* dict) {
-  dict->SetInteger("id", node.renderer_id());
+  dict->SetInteger("id", node.GetId());
 }
 
 base::string16 AccessibilityTreeFormatter::ToString(