Boolean properties for Accessibility Object Model Phase 1

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

 /*
  * Copyright (C) 2014, Google 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
@@ skipping 12 matching lines @@
  * 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/AXObjectCacheImpl.h"
 
 #include "core/HTMLNames.h"
 #include "core/InputTypeNames.h"
+#include "core/dom/AccessibleNode.h"
 #include "core/dom/Document.h"
 #include "core/dom/TaskRunnerHelper.h"
 #include "core/editing/EditingUtilities.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/html/HTMLAreaElement.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/HTMLImageElement.h"
 #include "core/html/HTMLInputElement.h"
@@ skipping 51 matching lines @@
 AXObjectCacheImpl::AXObjectCacheImpl(Document& document)
     : document_(document),
       modification_count_(0),
       notification_post_timer_(
           TaskRunnerHelper::Get(TaskType::kUnspecedTimer, &document),
           this,
           &AXObjectCacheImpl::NotificationPostTimerFired) {}
 
 AXObjectCacheImpl::~AXObjectCacheImpl() {
 #if DCHECK_IS_ON()
-  DCHECK(has_been_disposed_);
+  DCHECK(m_hasBeenDisposed);
 #endif
 }
 
 void AXObjectCacheImpl::Dispose() {
   notification_post_timer_.Stop();
 
   for (auto& entry : objects_) {
     AXObject* obj = entry.value;
     obj->Detach();
     RemoveAXID(obj);
   }
 
 #if DCHECK_IS_ON()
-  has_been_disposed_ = true;
+  m_hasBeenDisposed = true;
 #endif
 }
 
 AXObject* AXObjectCacheImpl::Root() {
   return GetOrCreate(document_);
 }
 
 AXObject* AXObjectCacheImpl::FocusedImageMapUIElement(
     HTMLAreaElement* area_element) {
   // Find the corresponding accessibility object for the HTMLAreaElement. This
@@ skipping 499 matching lines @@
 
     if (!obj->AxObjectID())
       continue;
 
     if (obj->IsDetached())
       continue;
 
 #if DCHECK_IS_ON()
     // Make sure none of the layout views are in the process of being layed out.
     // Notifications should only be sent after the layoutObject has finished
-    if (obj->IsAXLayoutObject()) {
-      AXLayoutObject* layout_obj = ToAXLayoutObject(obj);
-      LayoutObject* layout_object = layout_obj->GetLayoutObject();
-      if (layout_object && layout_object->View())
-        DCHECK(!layout_object->View()->GetLayoutState());
+    if (obj->isAXLayoutObject()) {
+      AXLayoutObject* layoutObj = toAXLayoutObject(obj);
+      LayoutObject* layoutObject = layoutObj->getLayoutObject();
+      if (layoutObject && layoutObject->view())
+        DCHECK(!layoutObject->view()->layoutState());
     }
 #endif
 
     AXNotification notification = notifications_to_post_[i].second;
     PostPlatformNotification(obj, notification);
 
     if (notification == kAXChildrenChanged && obj->ParentObjectIfExists() &&
         obj->LastKnownIsIgnoredValue() != obj->AccessibilityIsIgnored())
       ChildrenChanged(obj->ParentObject());
   }
@@ skipping 434 matching lines @@
   return ax_object && ax_object->IsTextControl();
 }
 
 bool IsNodeAriaVisible(Node* node) {
   if (!node)
     return false;
 
   if (!node->IsElementNode())
     return false;
 
-  return EqualIgnoringASCIICase(ToElement(node)->getAttribute(aria_hiddenAttr),
-                                "false");
+  bool is_null = true;
+  bool hidden = AccessibleNode::GetProperty(
+      ToElement(node), AOMBooleanProperty::kHidden, is_null);
+  return !is_null && !hidden;
 }
 
 void AXObjectCacheImpl::PostPlatformNotification(AXObject* obj,
                                                  AXNotification notification) {
   if (!obj || !obj->GetDocument() || !obj->DocumentFrameView() ||
       !obj->DocumentFrameView()->GetFrame().GetPage())
     return;
 
   ChromeClient& client =
       obj->GetDocument()->AxObjectCacheOwner().GetPage()->GetChromeClient();
@@ skipping 140 matching lines @@
   visitor->Trace(document_);
   visitor->Trace(node_object_mapping_);
 
   visitor->Trace(objects_);
   visitor->Trace(notifications_to_post_);
 
   AXObjectCache::Trace(visitor);
 }
 
 }  // namespace blink