Finish all string attributes for Accessibility Object Model Phase 1.

third_party/WebKit/Source/modules/accessibility/AXMenuListOption.cpp

 /*
  * Copyright (C) 2010 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "modules/accessibility/AXMenuListOption.h"
 
 #include "SkMatrix44.h"
+#include "core/dom/AccessibleNode.h"
 #include "modules/accessibility/AXMenuListPopup.h"
 #include "modules/accessibility/AXObjectCacheImpl.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
 AXMenuListOption::AXMenuListOption(HTMLOptionElement* element,
                                    AXObjectCacheImpl& axObjectCache)
     : AXMockObject(axObjectCache), m_element(element) {}
 
 AXMenuListOption::~AXMenuListOption() {
   ASSERT(!m_element);
 }
 
 void AXMenuListOption::detach() {
   m_element = nullptr;
   AXMockObject::detach();
 }
 
 AccessibilityRole AXMenuListOption::roleValue() const {
-  const AtomicString& ariaRole = getAttribute(roleAttr);
+  const AtomicString& ariaRole =
+      getAOMPropertyOrARIAAttribute(AOMStringProperty::kRole);
   if (ariaRole.isEmpty())
     return MenuListOptionRole;
 
   AccessibilityRole role = ariaRoleToWebCoreRole(ariaRole);
   if (role)
     return role;
   return MenuListOptionRole;
 }
 
 Element* AXMenuListOption::actionElement() const {
@@ skipping 96 matching lines @@
 
   return textAlternative;
 }
 
 DEFINE_TRACE(AXMenuListOption) {
   visitor->trace(m_element);
   AXMockObject::trace(visitor);
 }
 
 }  // namespace blink