Content API changes to improve DOM stitching in ThreatDetails code.

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 <stddef.h>
 
 #include <set>
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "content/common/accessibility_messages.h"
 #include "content/renderer/accessibility/blink_ax_enum_conversion.h"
 #include "content/renderer/accessibility/render_accessibility_impl.h"
 #include "content/renderer/browser_plugin/browser_plugin.h"
 #include "content/renderer/render_frame_impl.h"
 #include "content/renderer/render_frame_proxy.h"
 #include "content/renderer/render_view_impl.h"
-#include "content/renderer/web_frame_utils.h"
 #include "third_party/WebKit/public/platform/WebFloatRect.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/WebElement.h"
 #include "third_party/WebKit/public/web/WebFormControlElement.h"
@@ skipping 248 matching lines @@
   // Get the tree ID for this frame and the parent frame.
   WebLocalFrame* web_frame = document().GetFrame();
   if (web_frame) {
     RenderFrame* render_frame = RenderFrame::FromWebFrame(web_frame);
     tree_data->routing_id = render_frame->GetRoutingID();
 
     // Get the tree ID for the parent frame.
     blink::WebFrame* parent_web_frame = web_frame->Parent();
     if (parent_web_frame) {
       tree_data->parent_routing_id =
-          GetRoutingIdForFrameOrProxy(parent_web_frame);
+          RenderFrame::GetRoutingIdForWebFrame(parent_web_frame);
     }
   }
 
   return true;
 }
 
 blink::WebAXObject BlinkAXTreeSource::GetRoot() const {
   if (frozen_)
     return root_;
   else
@@ skipping 524 matching lines @@
     BrowserPlugin* browser_plugin = BrowserPlugin::GetFromNode(element);
     if (browser_plugin) {
       dst->AddContentIntAttribute(
           AX_CONTENT_ATTR_CHILD_BROWSER_PLUGIN_INSTANCE_ID,
           browser_plugin->browser_plugin_instance_id());
     }
 
     // Frames and iframes.
     WebFrame* frame = WebFrame::FromFrameOwnerElement(element);
     if (frame) {
-      dst->AddContentIntAttribute(
-          AX_CONTENT_ATTR_CHILD_ROUTING_ID,
-          GetRoutingIdForFrameOrProxy(frame));
+      dst->AddContentIntAttribute(AX_CONTENT_ATTR_CHILD_ROUTING_ID,
+                                  RenderFrame::GetRoutingIdForWebFrame(frame));
     }
   }
 
   // Add the ids of *indirect* children - those who are children of this node,
   // but whose parent is *not* this node. One example is a table
   // cell, which is a child of both a row and a column. Because the cell's
   // parent is the row, the row adds it as a child, and the column adds it
   // as an indirect child.
   int child_count = src.ChildCount();
   for (int i = 0; i < child_count; ++i) {
@@ skipping 40 matching lines @@
     return WebAXObject();
 
   WebDocument document = render_frame_->GetWebFrame()->GetDocument();
   if (!document.IsNull())
     return document.AccessibilityObject();
 
   return WebAXObject();
 }
 
 }  // namespace content