Hook up guest browser plugins to the accessibility tree.

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/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 "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/WebPlugin.h"
+#include "third_party/WebKit/public/web/WebPluginContainer.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::WebNode;
+using blink::WebPlugin;
+using blink::WebPluginContainer;
 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|,
 // |ancestor| is the *first* ancestor that isn't marked as
@@ skipping 40 matching lines @@
   std::vector<int32> ids;
   for(size_t i = 0; i < objects.size(); i++)
     ids.push_back(objects[i].axID());
   if (ids.size() > 0)
     dst->AddIntListAttribute(attr, ids);
 }
 
 }  // Anonymous namespace
 
 BlinkAXTreeSource::BlinkAXTreeSource(RenderFrameImpl* render_frame)
-    : render_frame_(render_frame) {
+    : render_frame_(render_frame),
+      node_to_frame_routing_id_map_(NULL),
+      node_to_browser_plugin_instance_id_map_(NULL) {
 }
 
 BlinkAXTreeSource::~BlinkAXTreeSource() {
 }
 
 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) {
+    std::map<int32, int>* node_to_frame_routing_id_map,
+    std::map<int32, int>* node_to_browser_plugin_instance_id_map) {
   node_to_frame_routing_id_map_ = node_to_frame_routing_id_map;
+  node_to_browser_plugin_instance_id_map_ =
+      node_to_browser_plugin_instance_id_map;
 }
 
 blink::WebAXObject BlinkAXTreeSource::GetRoot() const {
   return GetMainDocument().accessibilityObject();
 }
 
 blink::WebAXObject BlinkAXTreeSource::GetFromId(int32 id) const {
   return GetMainDocument().accessibilityObjectFromID(id);
 }
 
@@ skipping 214 matching lines @@
       std::string role = GetEquivalentAriaRoleString(dst->role);
       if (!role.empty())
         dst->AddStringAttribute(ui::AX_ATTR_ROLE, role);
     }
 
     // Live region attributes
     live_atomic = UTF16ToUTF8(element.getAttribute("aria-atomic"));
     live_busy = UTF16ToUTF8(element.getAttribute("aria-busy"));
     live_status = UTF16ToUTF8(element.getAttribute("aria-live"));
     live_relevant = UTF16ToUTF8(element.getAttribute("aria-relevant"));
+
+    // Browser plugin (used in a <webview>).
+
+    if (node_to_browser_plugin_instance_id_map_ &&
+        element.tagName() == base::ASCIIToUTF16("OBJECT") &&
+        element.getAttribute("type") ==
+            base::ASCIIToUTF16("application/browser-plugin")) {

[Fady Samuel, 2014/09/11 17:50:19]

I'm a little bit sad that we need to hard code these strings.

Perhaps we can add something to BrowserPluginManager that maps from element to
BrowserPlugin object? BrowserPluginManager::GetFromNode?

See BrowserPlugin::FromNode on line 669 in this patch?

https://codereview.chromium.org/444813002/diff/1/content/renderer/browser_plu...

It would be nice to have that sort of mapping instead of this hardcoding.

[dmazzoni, 2014/09/12 07:34:35]

Sure. I went ahead and put it in BrowserPlugin like in your patch, rather than
BrowserPluginManager, is that okay?

[Fady Samuel, 2014/09/12 15:47:44]

Yup, thanks! :-)

+      WebPluginContainer* plugin_container = element.pluginContainer();
+      if (plugin_container) {
+        WebPlugin* plugin = plugin_container->plugin();
+        if (plugin) {
+          BrowserPlugin* browser_plugin = static_cast<BrowserPlugin*>(plugin);
+          node_to_browser_plugin_instance_id_map_->insert(
+              std::pair<int32, int>(

[Fady Samuel, 2014/09/11 17:50:19]

Is it possible to make this a struct instead for readability, so it's clear what
the two values are in the map?

[dmazzoni, 2014/09/12 07:34:35]

I'm not sure how much more clear I can get than calling it
node_to_browser_plugin_instance_id_map. What if I switch to the operator[]
syntax for inserting, is that more clear?

Switching a map to a list of structs seems to lose the semantics that this
really is a mapping from keys (node ids) to values (browser plugin instance
ids).

[Fady Samuel, 2014/09/12 15:47:44]

Ohh sorry, I missed that this is a map and not a vector. 

+                  dst->id, browser_plugin->browser_plugin_instance_id()));
+          dst->AddBoolAttribute(ui::AX_ATTR_IS_AX_TREE_HOST, true);
+        }
+      }
+    }
   }
 
   // Walk up the parent chain to set live region attributes of containers
   std::string container_live_atomic;
   std::string container_live_busy;
   std::string container_live_status;
   std::string container_live_relevant;
   WebAXObject container_accessible = src;
   while (!container_accessible.isDetached()) {
     WebNode container_node = container_accessible.node();
@@ skipping 93 matching lines @@
     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()));
+        dst->AddBoolAttribute(ui::AX_ATTR_IS_AX_TREE_HOST, true);
       } 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()));
+          dst->AddBoolAttribute(ui::AX_ATTR_IS_AX_TREE_HOST, true);
         }
       }
     }
   }
 
   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;
@@ skipping 91 matching lines @@
     AddIntListAttributeFromWebObjects(ui::AX_ATTR_OWNS_IDS, owns, dst);
 }
 
 blink::WebDocument BlinkAXTreeSource::GetMainDocument() const {
   if (render_frame_ && render_frame_->GetWebFrame())
     return render_frame_->GetWebFrame()->document();
   return WebDocument();
 }
 
 }  // namespace content