Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / accessibility / AXNodeObject.cpp

diff --git a/src/third_party/WebKit/Source/core/accessibility/AXNodeObject.cpp b/src/third_party/WebKit/Source/core/accessibility/AXNodeObject.cpp
index 02577cd..6410e9c 100644 (file)
--- a/src/third_party/WebKit/Source/core/accessibility/AXNodeObject.cpp
+++ b/src/third_party/WebKit/Source/core/accessibility/AXNodeObject.cpp
@@ -73,6 +73,9 @@ AXNodeObject::~AXNodeObject()
 // ARIA Implementer's Guide.
 static String accessibleNameForNode(Node* node)
 {
+    if (!node)
+        return String();
+
     if (node->isTextNode())
         return toText(node)->data();
 
@@ -221,6 +224,10 @@ AccessibilityRole AXNodeObject::determineAccessibilityRole()
         return GroupRole;
     if (isHTMLAnchorElement(*node()) && isClickable())
         return LinkRole;
+    if (node()->hasTagName(iframeTag))
+        return IframeRole;
+    if (isEmbeddedObject())
+        return EmbeddedObjectRole;
 
     return UnknownRole;
 }
@@ -468,6 +475,13 @@ bool AXNodeObject::isControl() const
         || AXObject::isARIAControl(ariaRoleAttribute()));
 }
 
+bool AXNodeObject::isEmbeddedObject() const
+{
+    return node()
+        && (node()->hasTagName(objectTag) || node()->hasTagName(embedTag)
+        || node()->hasTagName(appletTag));
+}
+
 bool AXNodeObject::isFieldset() const
 {
     return isHTMLFieldSetElement(node());
@@ -999,7 +1013,7 @@ String AXNodeObject::stringValue() const
     if (isHTMLSelectElement(*node)) {
         HTMLSelectElement& selectElement = toHTMLSelectElement(*node);
         int selectedIndex = selectElement.selectedIndex();
-        const Vector<HTMLElement*> listItems = selectElement.listItems();
+        const WillBeHeapVector<RawPtrWillBeMember<HTMLElement> >& listItems = selectElement.listItems();
         if (selectedIndex >= 0 && static_cast<size_t>(selectedIndex) < listItems.size()) {
             const AtomicString& overriddenDescription = listItems[selectedIndex]->fastGetAttribute(aria_labelAttr);
             if (!overriddenDescription.isNull())