Revert of Cross-process iframe accessibility.

content/renderer/accessibility/blink_ax_tree_source.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/accessibility/blink_ax_tree_source.h"
 
 #include <set>
 
 #include "base/strings/string_number_conversions.h"
 #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_frame_proxy.h"
 #include "content/renderer/render_view_impl.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/WebKit/public/web/WebAXEnums.h"
 #include "third_party/WebKit/public/web/WebAXObject.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebDocumentType.h"
 #include "third_party/WebKit/public/web/WebElement.h"
 #include "third_party/WebKit/public/web/WebFormControlElement.h"
-#include "third_party/WebKit/public/web/WebFrame.h"
-#include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebInputElement.h"
 #include "third_party/WebKit/public/web/WebNode.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
 using base::ASCIIToUTF16;
 using base::UTF16ToUTF8;
 using blink::WebAXObject;
 using blink::WebDocument;
 using blink::WebDocumentType;
 using blink::WebElement;
-using blink::WebLocalFrame;
+using blink::WebFrame;
 using blink::WebNode;
 using blink::WebVector;
 using blink::WebView;
 
 namespace content {
 
 namespace {
 
 // Returns true if |ancestor| is the first unignored parent of |child|,
 // which means that when walking up the parent chain from |child|,
@@ skipping 57 matching lines @@
 bool BlinkAXTreeSource::IsInTree(blink::WebAXObject node) const {
   const blink::WebAXObject& root = GetRoot();
   while (IsValid(node)) {
     if (node.equals(root))
       return true;
     node = GetParent(node);
   }
   return false;
 }
 
-void BlinkAXTreeSource::CollectChildFrameIdMapping(
-    std::map<int32, int>* node_to_frame_routing_id_map) {
-  node_to_frame_routing_id_map_ = node_to_frame_routing_id_map;
-}
-
 blink::WebAXObject BlinkAXTreeSource::GetRoot() const {
   return GetMainDocument().accessibilityObject();
 }
 
 blink::WebAXObject BlinkAXTreeSource::GetFromId(int32 id) const {
   return GetMainDocument().accessibilityObjectFromID(id);
 }
 
 int32 BlinkAXTreeSource::GetId(blink::WebAXObject node) const {
   return node.axID();
@@ skipping 318 matching lines @@
     dst->AddIntAttribute(ui::AX_ATTR_SCROLL_X, scroll_offset.width());
     dst->AddIntAttribute(ui::AX_ATTR_SCROLL_Y, scroll_offset.height());
 
     const gfx::Size& min_offset = document.minimumScrollOffset();
     dst->AddIntAttribute(ui::AX_ATTR_SCROLL_X_MIN, min_offset.width());
     dst->AddIntAttribute(ui::AX_ATTR_SCROLL_Y_MIN, min_offset.height());
 
     const gfx::Size& max_offset = document.maximumScrollOffset();
     dst->AddIntAttribute(ui::AX_ATTR_SCROLL_X_MAX, max_offset.width());
     dst->AddIntAttribute(ui::AX_ATTR_SCROLL_Y_MAX, max_offset.height());
-
-    if (node_to_frame_routing_id_map_ && !src.equals(GetRoot())) {
-      WebLocalFrame* frame = document.frame();
-      RenderFrameImpl* render_frame = RenderFrameImpl::FromWebFrame(frame);
-      if (render_frame) {
-        node_to_frame_routing_id_map_->insert(std::pair<int32, int>(
-            dst->id, render_frame->GetRoutingID()));
-      } else {
-        RenderFrameProxy* render_frame_proxy =
-            RenderFrameProxy::FromWebFrame(frame);
-        if (render_frame_proxy) {
-          node_to_frame_routing_id_map_->insert(std::pair<int32, int>(
-              dst->id, render_frame_proxy->routing_id()));
-        }
-      }
-    }
   }
 
   if (dst->role == ui::AX_ROLE_TABLE) {
     int column_count = src.columnCount();
     int row_count = src.rowCount();
     if (column_count > 0 && row_count > 0) {
       std::set<int32> unique_cell_id_set;
       std::vector<int32> cell_ids;
       std::vector<int32> unique_cell_ids;
       dst->AddIntAttribute(ui::AX_ATTR_TABLE_COLUMN_COUNT, column_count);
@@ skipping 82 matching lines @@
     AddIntListAttributeFromWebObjects(
         ui::AX_ATTR_LABELLEDBY_IDS, labelledby, dst);
   }
 
   WebVector<WebAXObject> owns;
   if (src.ariaOwns(owns))
     AddIntListAttributeFromWebObjects(ui::AX_ATTR_OWNS_IDS, owns, dst);
 }
 
 blink::WebDocument BlinkAXTreeSource::GetMainDocument() const {
-  if (render_frame_ && render_frame_->GetWebFrame())
-    return render_frame_->GetWebFrame()->document();
+  WebView* view = render_frame_->render_view()->GetWebView();
+  WebFrame* main_frame = view ? view->mainFrame() : NULL;
+
+  if (main_frame)
+    return main_frame->document();
   return WebDocument();
 }
 
 }  // namespace content