Use GetRoutingIdForFrameOrProxy helper in BlinkAXTreeSource.

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/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/common/accessibility_messages.h"
 #include "content/renderer/accessibility/blink_ax_enum_conversion.h"
 #include "content/renderer/accessibility/renderer_accessibility.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/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"
 #include "third_party/WebKit/public/web/WebFrame.h"
@@ skipping 132 matching lines @@
   }
 
   // Get the tree ID for this frame and the parent frame.
   WebLocalFrame* web_frame = document.frame();
   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 && parent_web_frame->isWebRemoteFrame()) {
-      RenderFrameProxy* parent_render_frame_proxy =
-          RenderFrameProxy::FromWebFrame(parent_web_frame);
-      tree_data.parent_routing_id = parent_render_frame_proxy->routing_id();
-    } else if (parent_web_frame && parent_web_frame->isWebLocalFrame()) {
-      RenderFrame* parent_render_frame = RenderFrame::FromWebFrame(
-          parent_web_frame);
-      tree_data.parent_routing_id = parent_render_frame->GetRoutingID();
+    if (parent_web_frame) {
+      tree_data.parent_routing_id =
+          GetRoutingIdForFrameOrProxy(parent_web_frame);
     }
   }
 
   return tree_data;
 }
 
 blink::WebAXObject BlinkAXTreeSource::GetRoot() const {
   if (!root_.isNull())
     return root_;
   return GetMainDocument().accessibilityObject();
@@ skipping 273 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());
     }
 
     // Iframe.
     if (is_iframe) {
       WebFrame* frame = WebFrame::fromFrameOwnerElement(element);
-      if (frame && frame->isWebRemoteFrame()) {
-        RenderFrameProxy* render_frame_proxy =
-            RenderFrameProxy::FromWebFrame(frame);
-        DCHECK(render_frame_proxy);
+      if (frame) {
         dst->AddContentIntAttribute(
             AX_CONTENT_ATTR_CHILD_ROUTING_ID,
-            render_frame_proxy->routing_id());
-      } else if (frame && frame->isWebLocalFrame()) {
-        RenderFrame* render_frame = RenderFrame::FromWebFrame(frame);
-        DCHECK(render_frame);
-        dst->AddContentIntAttribute(
-            AX_CONTENT_ATTR_CHILD_ROUTING_ID,
-            render_frame->GetRoutingID());
+            GetRoutingIdForFrameOrProxy(frame));
       }
     }
   }
 
   if (src.isInLiveRegion()) {
     dst->AddBoolAttribute(ui::AX_ATTR_LIVE_ATOMIC, src.liveRegionAtomic());
     dst->AddBoolAttribute(ui::AX_ATTR_LIVE_BUSY, src.liveRegionBusy());
     if (src.liveRegionBusy())
       dst->state |= (1 << ui::AX_STATE_BUSY);
     if (!src.liveRegionStatus().isEmpty()) {
@@ skipping 132 matching lines @@
   }
 }
 
 blink::WebDocument BlinkAXTreeSource::GetMainDocument() const {
   if (render_frame_ && render_frame_->GetWebFrame())
     return render_frame_->GetWebFrame()->document();
   return WebDocument();
 }
 
 }  // namespace content