Fix frameset 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 <stddef.h>
 
 #include <set>
 
@@ skipping 507 matching lines @@
     }
 
     // Browser plugin (used in a <webview>).
     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) {
-        dst->AddContentIntAttribute(
-            AX_CONTENT_ATTR_CHILD_ROUTING_ID,
-            GetRoutingIdForFrameOrProxy(frame));
-      }
+    // Frames and iframes.
+    WebFrame* frame = WebFrame::fromFrameOwnerElement(element);
+    if (frame) {
+      dst->AddContentIntAttribute(
+          AX_CONTENT_ATTR_CHILD_ROUTING_ID,
+          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()) {
       dst->AddStringAttribute(
@@ skipping 140 matching lines @@
   }
 }
 
 blink::WebDocument BlinkAXTreeSource::GetMainDocument() const {
   if (render_frame_ && render_frame_->GetWebFrame())
     return render_frame_->GetWebFrame()->document();
   return WebDocument();
 }
 
 }  // namespace content