Implement AccessibleNode.hasPopUp for Accessibility Object Model phase 1

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

 // 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 "modules/accessibility/InspectorAccessibilityAgent.h"
 
 #include <memory>
 #include "core/HTMLNames.h"
 #include "core/dom/AXObjectCache.h"
 #include "core/dom/DOMNodeIds.h"
@@ skipping 147 matching lines @@
 
 void FillWidgetProperties(AXObject& ax_object,
                           protocol::Array<AXProperty>& properties) {
   AccessibilityRole role = ax_object.RoleValue();
   String autocomplete = ax_object.AriaAutoComplete();
   if (!autocomplete.IsEmpty())
     properties.addItem(
         CreateProperty(AXWidgetAttributesEnum::Autocomplete,
                        CreateValue(autocomplete, AXValueTypeEnum::Token)));
 
-  if (ax_object.HasAttribute(HTMLNames::aria_haspopupAttr)) {
-    bool has_popup = ax_object.AriaHasPopup();
+  bool has_popup = ax_object.AriaHasPopup();
+  if (has_popup || ax_object.HasAttribute(HTMLNames::aria_haspopupAttr)) {
     properties.addItem(CreateProperty(AXWidgetAttributesEnum::Haspopup,
                                       CreateBooleanValue(has_popup)));
   }
 
   int heading_level = ax_object.HeadingLevel();
   if (heading_level > 0) {
     properties.addItem(CreateProperty(AXWidgetAttributesEnum::Level,
                                       CreateValue(heading_level)));
   }
   int hierarchical_level = ax_object.HierarchicalLevel();
@@ skipping 534 matching lines @@
   }
 }
 
 DEFINE_TRACE(InspectorAccessibilityAgent) {
   visitor->Trace(page_);
   visitor->Trace(dom_agent_);
   InspectorBaseAgent::Trace(visitor);
 }
 
 }  // namespace blink