Skip to content

Commit

Permalink
Revert of Add AX role ,'AXDescriptionList', for dl element. (patchset #2
Browse files Browse the repository at this point in the history
 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<james@cookiecrook.com> wkrev.com/147520 and the
> patch written by Mario Sanchez Prada  <mario.prada@samsung.com>
> 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

TBR=dmazzoni@chromium.org,je_julie.kim@samsung.com
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
  • Loading branch information
eustas@chromium.org committed Sep 29, 2014
1 parent a6e85ba commit ba43abd
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 27 deletions.
16 changes: 0 additions & 16 deletions Source/core/accessibility/AXList.cpp
Expand Up @@ -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
3 changes: 1 addition & 2 deletions Source/core/accessibility/AXList.h
Expand Up @@ -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;
};

Expand Down
3 changes: 0 additions & 3 deletions Source/core/accessibility/AXNodeObject.cpp
Expand Up @@ -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"
Expand Down Expand Up @@ -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))
Expand Down
1 change: 0 additions & 1 deletion Source/core/accessibility/AXObject.h
Expand Up @@ -80,7 +80,6 @@ enum AccessibilityRole {
ContentInfoRole,
DefinitionRole,
DescriptionListDetailRole,
DescriptionListRole,
DescriptionListTermRole,
DetailsRole,
DialogRole,
Expand Down
3 changes: 0 additions & 3 deletions Source/core/accessibility/AXRenderObject.cpp
Expand Up @@ -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;

Expand Down
1 change: 0 additions & 1 deletion Source/web/AssertMatchingEnums.cpp
Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion public/web/WebAXEnums.h
Expand Up @@ -92,7 +92,6 @@ enum WebAXRole {
WebAXRoleContentInfo,
WebAXRoleDefinition,
WebAXRoleDescriptionListDetail,
WebAXRoleDescriptionList,
WebAXRoleDescriptionListTerm,
WebAXRoleDetails,
WebAXRoleDialog,
Expand Down

0 comments on commit ba43abd

Please sign in to comment.