Move AXNotification to AXObjectCacheImpl

There was no need for AXNotification to be exposed in AXObjectCache.
It's more of an internal detail to accessibility and doesn't belong
in the public interface to it in core/dom.

This is a pure refactoring change only.

Bug: 699438
Change-Id: I17c02dd093d4857dab1ce015d4e55dd6bed567af
Reviewed-on: https://chromium-review.googlesource.com/820097Reviewed-by: Mike West <mkwst@chromium.org>
Commit-Queue: Dominic Mazzoni <dmazzoni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#523441}

third_party/WebKit/Source/core/dom/AXObjectCache.cpp

@@ -170,56 +170,4 @@ void AXObjectCache::Trace(blink::Visitor* visitor) {
   ContextLifecycleObserver::Trace(visitor);
 }
 
-STATIC_ASSERT_ENUM(kWebAXEventActiveDescendantChanged,
-                   AXObjectCache::kAXActiveDescendantChanged);
-STATIC_ASSERT_ENUM(kWebAXEventAlert, AXObjectCache::kAXAlert);
-STATIC_ASSERT_ENUM(kWebAXEventAriaAttributeChanged,
-                   AXObjectCache::kAXAriaAttributeChanged);
-STATIC_ASSERT_ENUM(kWebAXEventAutocorrectionOccured,
-                   AXObjectCache::kAXAutocorrectionOccured);
-STATIC_ASSERT_ENUM(kWebAXEventBlur, AXObjectCache::kAXBlur);
-STATIC_ASSERT_ENUM(kWebAXEventCheckedStateChanged,
-                   AXObjectCache::kAXCheckedStateChanged);
-STATIC_ASSERT_ENUM(kWebAXEventChildrenChanged,
-                   AXObjectCache::kAXChildrenChanged);
-STATIC_ASSERT_ENUM(kWebAXEventClicked, AXObjectCache::kAXClicked);
-STATIC_ASSERT_ENUM(kWebAXEventDocumentSelectionChanged,
-                   AXObjectCache::kAXDocumentSelectionChanged);
-STATIC_ASSERT_ENUM(kWebAXEventExpandedChanged,
-                   AXObjectCache::kAXExpandedChanged);
-STATIC_ASSERT_ENUM(kWebAXEventFocus, AXObjectCache::kAXFocusedUIElementChanged);
-STATIC_ASSERT_ENUM(kWebAXEventHide, AXObjectCache::kAXHide);
-STATIC_ASSERT_ENUM(kWebAXEventHover, AXObjectCache::kAXHover);
-STATIC_ASSERT_ENUM(kWebAXEventInvalidStatusChanged,
-                   AXObjectCache::kAXInvalidStatusChanged);
-STATIC_ASSERT_ENUM(kWebAXEventLayoutComplete, AXObjectCache::kAXLayoutComplete);
-STATIC_ASSERT_ENUM(kWebAXEventLiveRegionChanged,
-                   AXObjectCache::kAXLiveRegionChanged);
-STATIC_ASSERT_ENUM(kWebAXEventLoadComplete, AXObjectCache::kAXLoadComplete);
-STATIC_ASSERT_ENUM(kWebAXEventLocationChanged,
-                   AXObjectCache::kAXLocationChanged);
-STATIC_ASSERT_ENUM(kWebAXEventMenuListItemSelected,
-                   AXObjectCache::kAXMenuListItemSelected);
-STATIC_ASSERT_ENUM(kWebAXEventMenuListItemUnselected,
-                   AXObjectCache::kAXMenuListItemUnselected);
-STATIC_ASSERT_ENUM(kWebAXEventMenuListValueChanged,
-                   AXObjectCache::kAXMenuListValueChanged);
-STATIC_ASSERT_ENUM(kWebAXEventRowCollapsed, AXObjectCache::kAXRowCollapsed);
-STATIC_ASSERT_ENUM(kWebAXEventRowCountChanged,
-                   AXObjectCache::kAXRowCountChanged);
-STATIC_ASSERT_ENUM(kWebAXEventRowExpanded, AXObjectCache::kAXRowExpanded);
-STATIC_ASSERT_ENUM(kWebAXEventScrollPositionChanged,
-                   AXObjectCache::kAXScrollPositionChanged);
-STATIC_ASSERT_ENUM(kWebAXEventScrolledToAnchor,
-                   AXObjectCache::kAXScrolledToAnchor);
-STATIC_ASSERT_ENUM(kWebAXEventSelectedChildrenChanged,
-                   AXObjectCache::kAXSelectedChildrenChanged);
-STATIC_ASSERT_ENUM(kWebAXEventSelectedTextChanged,
-                   AXObjectCache::kAXSelectedTextChanged);
-STATIC_ASSERT_ENUM(kWebAXEventShow, AXObjectCache::kAXShow);
-STATIC_ASSERT_ENUM(kWebAXEventTextChanged, AXObjectCache::kAXTextChanged);
-STATIC_ASSERT_ENUM(kWebAXEventTextInserted, AXObjectCache::kAXTextInserted);
-STATIC_ASSERT_ENUM(kWebAXEventTextRemoved, AXObjectCache::kAXTextRemoved);
-STATIC_ASSERT_ENUM(kWebAXEventValueChanged, AXObjectCache::kAXValueChanged);
-
 }  // namespace blink

third_party/WebKit/Source/core/dom/AXObjectCache.h

@@ -57,42 +57,6 @@ class CORE_EXPORT AXObjectCache
   virtual ~AXObjectCache();
   virtual void Trace(blink::Visitor*);
 
-  enum AXNotification {
-    kAXActiveDescendantChanged,
-    kAXAlert,
-    kAXAriaAttributeChanged,
-    kAXAutocorrectionOccured,
-    kAXBlur,
-    kAXCheckedStateChanged,
-    kAXChildrenChanged,
-    kAXClicked,
-    kAXDocumentSelectionChanged,
-    kAXExpandedChanged,
-    kAXFocusedUIElementChanged,
-    kAXHide,
-    kAXHover,
-    kAXInvalidStatusChanged,
-    kAXLayoutComplete,
-    kAXLiveRegionChanged,
-    kAXLoadComplete,
-    kAXLocationChanged,
-    kAXMenuListItemSelected,
-    kAXMenuListItemUnselected,
-    kAXMenuListValueChanged,
-    kAXRowCollapsed,
-    kAXRowCountChanged,
-    kAXRowExpanded,
-    kAXScrollPositionChanged,
-    kAXScrolledToAnchor,
-    kAXSelectedChildrenChanged,
-    kAXSelectedTextChanged,
-    kAXShow,
-    kAXTextChanged,
-    kAXTextInserted,
-    kAXTextRemoved,
-    kAXValueChanged
-  };
-
   virtual void Dispose() = 0;
 
   virtual void SelectionChanged(Node*) = 0;

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

@@ -1079,7 +1079,7 @@ void AXObjectCacheImpl::HandleFocusedUIElementChanged(Node* old_focused_node,
 }
 
 void AXObjectCacheImpl::HandleInitialFocus() {
-  PostNotification(document_, AXObjectCache::kAXFocusedUIElementChanged);
+  PostNotification(document_, kAXFocusedUIElementChanged);
 }
 
 void AXObjectCacheImpl::HandleEditableTextContentChanged(Node* node) {
@@ -1097,7 +1097,7 @@ void AXObjectCacheImpl::HandleEditableTextContentChanged(Node* node) {
 
   while (obj && !obj->IsNativeTextControl() && !obj->IsNonNativeTextControl())
     obj = obj->ParentObject();
-  PostNotification(obj, AXObjectCache::kAXValueChanged);
+  PostNotification(obj, kAXValueChanged);
 }
 
 void AXObjectCacheImpl::HandleTextFormControlChanged(Node* node) {
@@ -1116,7 +1116,7 @@ void AXObjectCacheImpl::HandleTextMarkerDataAdded(Node* start, Node* end) {
 }
 
 void AXObjectCacheImpl::HandleValueChanged(Node* node) {
-  PostNotification(node, AXObjectCache::kAXValueChanged);
+  PostNotification(node, kAXValueChanged);
 }
 
 void AXObjectCacheImpl::HandleUpdateActiveMenuOption(LayoutMenuList* menu_list,
@@ -1145,12 +1145,12 @@ void AXObjectCacheImpl::DidHideMenuListPopup(LayoutMenuList* menu_list) {
 }
 
 void AXObjectCacheImpl::HandleLoadComplete(Document* document) {
-  PostNotification(GetOrCreate(document), AXObjectCache::kAXLoadComplete);
+  PostNotification(GetOrCreate(document), kAXLoadComplete);
   AddPermissionStatusListener();
 }
 
 void AXObjectCacheImpl::HandleLayoutComplete(Document* document) {
-  PostNotification(GetOrCreate(document), AXObjectCache::kAXLayoutComplete);
+  PostNotification(GetOrCreate(document), kAXLayoutComplete);
 }
 
 void AXObjectCacheImpl::HandleScrolledToAnchor(const Node* anchor_node) {
@@ -1290,4 +1290,58 @@ void AXObjectCacheImpl::Trace(blink::Visitor* visitor) {
   AXObjectCache::Trace(visitor);
 }
 
+STATIC_ASSERT_ENUM(kWebAXEventActiveDescendantChanged,
+                   AXObjectCacheImpl::kAXActiveDescendantChanged);
+STATIC_ASSERT_ENUM(kWebAXEventAlert, AXObjectCacheImpl::kAXAlert);
+STATIC_ASSERT_ENUM(kWebAXEventAriaAttributeChanged,
+                   AXObjectCacheImpl::kAXAriaAttributeChanged);
+STATIC_ASSERT_ENUM(kWebAXEventAutocorrectionOccured,
+                   AXObjectCacheImpl::kAXAutocorrectionOccured);
+STATIC_ASSERT_ENUM(kWebAXEventBlur, AXObjectCacheImpl::kAXBlur);
+STATIC_ASSERT_ENUM(kWebAXEventCheckedStateChanged,
+                   AXObjectCacheImpl::kAXCheckedStateChanged);
+STATIC_ASSERT_ENUM(kWebAXEventChildrenChanged,
+                   AXObjectCacheImpl::kAXChildrenChanged);
+STATIC_ASSERT_ENUM(kWebAXEventClicked, AXObjectCacheImpl::kAXClicked);
+STATIC_ASSERT_ENUM(kWebAXEventDocumentSelectionChanged,
+                   AXObjectCacheImpl::kAXDocumentSelectionChanged);
+STATIC_ASSERT_ENUM(kWebAXEventExpandedChanged,
+                   AXObjectCacheImpl::kAXExpandedChanged);
+STATIC_ASSERT_ENUM(kWebAXEventFocus,
+                   AXObjectCacheImpl::kAXFocusedUIElementChanged);
+STATIC_ASSERT_ENUM(kWebAXEventHide, AXObjectCacheImpl::kAXHide);
+STATIC_ASSERT_ENUM(kWebAXEventHover, AXObjectCacheImpl::kAXHover);
+STATIC_ASSERT_ENUM(kWebAXEventInvalidStatusChanged,
+                   AXObjectCacheImpl::kAXInvalidStatusChanged);
+STATIC_ASSERT_ENUM(kWebAXEventLayoutComplete,
+                   AXObjectCacheImpl::kAXLayoutComplete);
+STATIC_ASSERT_ENUM(kWebAXEventLiveRegionChanged,
+                   AXObjectCacheImpl::kAXLiveRegionChanged);
+STATIC_ASSERT_ENUM(kWebAXEventLoadComplete, AXObjectCacheImpl::kAXLoadComplete);
+STATIC_ASSERT_ENUM(kWebAXEventLocationChanged,
+                   AXObjectCacheImpl::kAXLocationChanged);
+STATIC_ASSERT_ENUM(kWebAXEventMenuListItemSelected,
+                   AXObjectCacheImpl::kAXMenuListItemSelected);
+STATIC_ASSERT_ENUM(kWebAXEventMenuListItemUnselected,
+                   AXObjectCacheImpl::kAXMenuListItemUnselected);
+STATIC_ASSERT_ENUM(kWebAXEventMenuListValueChanged,
+                   AXObjectCacheImpl::kAXMenuListValueChanged);
+STATIC_ASSERT_ENUM(kWebAXEventRowCollapsed, AXObjectCacheImpl::kAXRowCollapsed);
+STATIC_ASSERT_ENUM(kWebAXEventRowCountChanged,
+                   AXObjectCacheImpl::kAXRowCountChanged);
+STATIC_ASSERT_ENUM(kWebAXEventRowExpanded, AXObjectCacheImpl::kAXRowExpanded);
+STATIC_ASSERT_ENUM(kWebAXEventScrollPositionChanged,
+                   AXObjectCacheImpl::kAXScrollPositionChanged);
+STATIC_ASSERT_ENUM(kWebAXEventScrolledToAnchor,
+                   AXObjectCacheImpl::kAXScrolledToAnchor);
+STATIC_ASSERT_ENUM(kWebAXEventSelectedChildrenChanged,
+                   AXObjectCacheImpl::kAXSelectedChildrenChanged);
+STATIC_ASSERT_ENUM(kWebAXEventSelectedTextChanged,
+                   AXObjectCacheImpl::kAXSelectedTextChanged);
+STATIC_ASSERT_ENUM(kWebAXEventShow, AXObjectCacheImpl::kAXShow);
+STATIC_ASSERT_ENUM(kWebAXEventTextChanged, AXObjectCacheImpl::kAXTextChanged);
+STATIC_ASSERT_ENUM(kWebAXEventTextInserted, AXObjectCacheImpl::kAXTextInserted);
+STATIC_ASSERT_ENUM(kWebAXEventTextRemoved, AXObjectCacheImpl::kAXTextRemoved);
+STATIC_ASSERT_ENUM(kWebAXEventValueChanged, AXObjectCacheImpl::kAXValueChanged);
+
 }  // namespace blink

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

@@ -56,6 +56,42 @@ class MODULES_EXPORT AXObjectCacheImpl
  public:
   static AXObjectCache* Create(Document&);
 
+  enum AXNotification {
+    kAXActiveDescendantChanged,
+    kAXAlert,
+    kAXAriaAttributeChanged,
+    kAXAutocorrectionOccured,
+    kAXBlur,
+    kAXCheckedStateChanged,
+    kAXChildrenChanged,
+    kAXClicked,
+    kAXDocumentSelectionChanged,
+    kAXExpandedChanged,
+    kAXFocusedUIElementChanged,
+    kAXHide,
+    kAXHover,
+    kAXInvalidStatusChanged,
+    kAXLayoutComplete,
+    kAXLiveRegionChanged,
+    kAXLoadComplete,
+    kAXLocationChanged,
+    kAXMenuListItemSelected,
+    kAXMenuListItemUnselected,
+    kAXMenuListValueChanged,
+    kAXRowCollapsed,
+    kAXRowCountChanged,
+    kAXRowExpanded,
+    kAXScrollPositionChanged,
+    kAXScrolledToAnchor,
+    kAXSelectedChildrenChanged,
+    kAXSelectedTextChanged,
+    kAXShow,
+    kAXTextChanged,
+    kAXTextInserted,
+    kAXTextRemoved,
+    kAXValueChanged
+  };
+
   explicit AXObjectCacheImpl(Document&);
   virtual ~AXObjectCacheImpl();
   virtual void Trace(blink::Visitor*);