Revert of Add AX role ,'AXDescriptionList', for dl element. (patchset #2

id:20001 of https://codereview.chromium.org/609793002/) Reason for revert: This patch, probably, broke AccesibilityDl test on Mac http://build.chromium.org/p/chromium.webkit/builders/Win7%20Tests/builds/5898 Original issue's description: > Add AX role ,'AXDescriptionList', for dl element. > > There are related patches from WebKit, the patch written by > James Craig<[email protected]> wkrev.com/147520 and the > patch written by Mario Sanchez Prada <[email protected]> > wkrev.com/161492. > And I modified them based on the current blink. > > BUG=226505 > > Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=182813 [email protected],[email protected] NOTREECHECKS=true NOTRY=true BUG=226505 Review URL: https://codereview.chromium.org/616553002 git-svn-id: svn://svn.chromium.org/blink/trunk@182847 bbb929c8-8fbe-4397-9dbb-9b2b20218538
yoavweiss · Sep 29, 2014 · ba43abd · ba43abd
1 parent a6e85ba
commit ba43abd
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 27 deletions.
diff --git a/Source/core/accessibility/AXList.cpp b/Source/core/accessibility/AXList.cpp
@@ -56,20 +56,4 @@ bool AXList::computeAccessibilityIsIgnored() const
     return accessibilityIsIgnoredByDefault();
 }
 
-bool AXList::isDescriptionList() const
-{
-    if (!m_renderer)
-        return false;
-
-    Node* node = m_renderer->node();
-    return node && node->hasTagName(dlTag);
-}
-
-AccessibilityRole AXList::roleValue() const
-{
-    if (isDescriptionList())
-        return DescriptionListRole;
-
-    return ListRole;
-}
 } // namespace blink
diff --git a/Source/core/accessibility/AXList.h b/Source/core/accessibility/AXList.h
@@ -43,9 +43,8 @@ class AXList FINAL : public AXRenderObject {
 
     virtual bool isList() const OVERRIDE { return true; }
 
-    virtual AccessibilityRole roleValue() const OVERRIDE FINAL;
+    virtual AccessibilityRole roleValue() const OVERRIDE { return ListRole; }
 private:
-    bool isDescriptionList() const;
     virtual bool computeAccessibilityIsIgnored() const OVERRIDE;
 };
 

diff --git a/Source/core/accessibility/AXNodeObject.cpp b/Source/core/accessibility/AXNodeObject.cpp
@@ -33,7 +33,6 @@
 #include "core/accessibility/AXObjectCache.h"
 #include "core/dom/NodeTraversal.h"
 #include "core/dom/Text.h"
-#include "core/html/HTMLDListElement.h"
 #include "core/html/HTMLFieldSetElement.h"
 #include "core/html/HTMLFrameElementBase.h"
 #include "core/html/HTMLInputElement.h"
@@ -237,8 +236,6 @@ AccessibilityRole AXNodeObject::determineAccessibilityRole()
         return ParagraphRole;
     if (isHTMLLabelElement(*node()))
         return LabelRole;
-    if (isHTMLDListElement(*node()))
-        return DescriptionListRole;
     if (node()->isElementNode() && node()->hasTagName(figcaptionTag))
         return FigcaptionRole;
     if (node()->isElementNode() && node()->hasTagName(figureTag))

diff --git a/Source/core/accessibility/AXObject.h b/Source/core/accessibility/AXObject.h
@@ -80,7 +80,6 @@ enum AccessibilityRole {
     ContentInfoRole,
     DefinitionRole,
     DescriptionListDetailRole,
-    DescriptionListRole,
     DescriptionListTermRole,
     DetailsRole,
     DialogRole,

diff --git a/Source/core/accessibility/AXRenderObject.cpp b/Source/core/accessibility/AXRenderObject.cpp
@@ -348,9 +348,6 @@ AccessibilityRole AXRenderObject::determineAccessibilityRole()
     if (node && node->hasTagName(ddTag))
         return DescriptionListDetailRole;
 
-    if (node && node->hasTagName(dlTag))
-        return DescriptionListRole;
-
     if (node && node->hasTagName(dtTag))
         return DescriptionListTermRole;
 

diff --git a/Source/web/AssertMatchingEnums.cpp b/Source/web/AssertMatchingEnums.cpp
@@ -192,7 +192,6 @@ COMPILE_ASSERT_MATCHING_ENUM(WebAXRoleComplementary, ComplementaryRole);
 COMPILE_ASSERT_MATCHING_ENUM(WebAXRoleContentInfo, ContentInfoRole);
 COMPILE_ASSERT_MATCHING_ENUM(WebAXRoleDefinition, DefinitionRole);
 COMPILE_ASSERT_MATCHING_ENUM(WebAXRoleDescriptionListDetail, DescriptionListDetailRole);
-COMPILE_ASSERT_MATCHING_ENUM(WebAXRoleDescriptionList, DescriptionListRole);
 COMPILE_ASSERT_MATCHING_ENUM(WebAXRoleDescriptionListTerm, DescriptionListTermRole);
 COMPILE_ASSERT_MATCHING_ENUM(WebAXRoleDetails, DetailsRole);
 COMPILE_ASSERT_MATCHING_ENUM(WebAXRoleDialog, DialogRole);

diff --git a/public/web/WebAXEnums.h b/public/web/WebAXEnums.h
@@ -92,7 +92,6 @@ enum WebAXRole {
     WebAXRoleContentInfo,
     WebAXRoleDefinition,
     WebAXRoleDescriptionListDetail,
-    WebAXRoleDescriptionList,
     WebAXRoleDescriptionListTerm,
     WebAXRoleDetails,
     WebAXRoleDialog,