Clean up accessibility enums for use in Chromium.

Source/testing/runner/WebTestProxy.cpp

 /*
  * Copyright (C) 2012 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 31 matching lines @@
 #include "TestPlugin.h"
 #include "TestRunner.h"
 #include "WebUserMediaClientMock.h"
 #include "public/platform/WebCString.h"
 #include "public/platform/WebURLError.h"
 #include "public/platform/WebURLRequest.h"
 #include "public/platform/WebURLResponse.h"
 #include "public/testing/WebTestDelegate.h"
 #include "public/testing/WebTestInterfaces.h"
 #include "public/testing/WebTestRunner.h"
-#include "public/web/WebAccessibilityNotification.h"
+#include "public/web/WebAccessibilityEnums.h"
 #include "public/web/WebAccessibilityObject.h"
 #include "public/web/WebCachedURLRequest.h"
 #include "public/web/WebConsoleMessage.h"
 #include "public/web/WebDataSource.h"
 #include "public/web/WebDeviceOrientationClientMock.h"
 #include "public/web/WebDocument.h"
 #include "public/web/WebElement.h"
 #include "public/web/WebFrame.h"
 #include "public/web/WebGeolocationClientMock.h"
 #include "public/web/WebHistoryItem.h"
@@ skipping 748 matching lines @@
 {
     invalidateAll();
     discardBackingStore();
 }
 
 void WebTestProxyBase::didAutoResize(const WebSize&)
 {
     invalidateAll();
 }
 
-void WebTestProxyBase::postAccessibilityNotification(const WebKit::WebAccessibilityObject& obj, WebKit::WebAccessibilityNotification notification)
+void WebTestProxyBase::postAccessibilityNotification(const WebKit::WebAccessibilityObject& obj, WebKit::AXNotification notification)
 {
-    if (notification == WebKit::WebAccessibilityNotificationFocusedUIElementChanged)
+    if (notification == WebKit::AXFocus)
         m_testInterfaces->accessibilityController()->setFocusedElement(obj);
 
     const char* notificationName;
     switch (notification) {
-    case WebKit::WebAccessibilityNotificationActiveDescendantChanged:
+    case WebKit::AXActiveDescendantChanged:
         notificationName = "ActiveDescendantChanged";
         break;
-    case WebKit::WebAccessibilityNotificationAutocorrectionOccured:
+    case WebKit::AXAlert:
+        notificationName = "Alert";
+        break;
+    case WebKit::AXAriaAttributeChanged:
+        notificationName = "AriaAttributeChanged";
+        break;
+    case WebKit::AXAutocorrectionOccured:
         notificationName = "AutocorrectionOccured";
         break;
-    case WebKit::WebAccessibilityNotificationCheckedStateChanged:
+    case WebKit::AXBlur:
+        notificationName = "Blur";
+        break;
+    case WebKit::AXCheckedStateChanged:
         notificationName = "CheckedStateChanged";
         break;
-    case WebKit::WebAccessibilityNotificationChildrenChanged:
+    case WebKit::AXChildrenChanged:
         notificationName = "ChildrenChanged";
         break;
-    case WebKit::WebAccessibilityNotificationFocusedUIElementChanged:
-        notificationName = "FocusedUIElementChanged";
+    case WebKit::AXFocus:
+        notificationName = "Focus";
         break;
-    case WebKit::WebAccessibilityNotificationLayoutComplete:
+    case WebKit::AXHide:
+        notificationName = "Hide";
+        break;
+    case WebKit::AXInvalidStatusChanged:
+        notificationName = "InvalidStatusChanged";
+        break;
+    case WebKit::AXLayoutComplete:
         notificationName = "LayoutComplete";
         break;
-    case WebKit::WebAccessibilityNotificationLoadComplete:
+    case WebKit::AXLiveRegionChanged:
+        notificationName = "LiveRegionChanged";
+        break;
+    case WebKit::AXLoadComplete:
         notificationName = "LoadComplete";
         break;
-    case WebKit::WebAccessibilityNotificationSelectedChildrenChanged:
+    case WebKit::AXLocationChanged:
+        notificationName = "LocationChanged";
+        break;
+    case WebKit::AXMenuListItemSelected:
+        notificationName = "MenuListItemSelected";
+        break;
+    case WebKit::AXMenuListValueChanged:
+        notificationName = "MenuListValueChanged";
+        break;
+    case WebKit::AXRowCollapsed:
+        notificationName = "RowCollapsed";
+        break;
+    case WebKit::AXRowCountChanged:
+        notificationName = "RowCountChanged";
+        break;
+    case WebKit::AXRowExpanded:
+        notificationName = "RowExpanded";
+        break;
+    case WebKit::AXScrolledToAnchor:
+        notificationName = "ScrolledToAnchor";
+        break;
+    case WebKit::AXSelectedChildrenChanged:
         notificationName = "SelectedChildrenChanged";
         break;
-    case WebKit::WebAccessibilityNotificationSelectedTextChanged:
+    case WebKit::AXSelectedTextChanged:
         notificationName = "SelectedTextChanged";
         break;
-    case WebKit::WebAccessibilityNotificationValueChanged:
-        notificationName = "ValueChanged";
+    case WebKit::AXShow:
+        notificationName = "Show";
         break;
-    case WebKit::WebAccessibilityNotificationScrolledToAnchor:
-        notificationName = "ScrolledToAnchor";
-        break;
-    case WebKit::WebAccessibilityNotificationLiveRegionChanged:
-        notificationName = "LiveRegionChanged";
-        break;
-    case WebKit::WebAccessibilityNotificationMenuListItemSelected:
-        notificationName = "MenuListItemSelected";
-        break;
-    case WebKit::WebAccessibilityNotificationMenuListValueChanged:
-        notificationName = "MenuListValueChanged";
-        break;
-    case WebKit::WebAccessibilityNotificationRowCountChanged:
-        notificationName = "RowCountChanged";
-        break;
-    case WebKit::WebAccessibilityNotificationRowCollapsed:
-        notificationName = "RowCollapsed";
-        break;
-    case WebKit::WebAccessibilityNotificationRowExpanded:
-        notificationName = "RowExpanded";
-        break;
-    case WebKit::WebAccessibilityNotificationInvalidStatusChanged:
-        notificationName = "InvalidStatusChanged";
-        break;
-    case WebKit::WebAccessibilityNotificationTextChanged:
+    case WebKit::AXTextChanged:
         notificationName = "TextChanged";
         break;
-    case WebKit::WebAccessibilityNotificationAriaAttributeChanged:
-        notificationName = "AriaAttributeChanged";
+    case WebKit::AXTextInserted:
+        notificationName = "TextInserted";
         break;
-    default:
-        notificationName = "UnknownNotification";
+    case WebKit::AXTextRemoved:
+        notificationName = "TextRemoved";
+        break;
+    case WebKit::AXValueChanged:
+        notificationName = "ValueChanged";
         break;
     }
 
     m_testInterfaces->accessibilityController()->notificationReceived(obj, notificationName);
 
     if (m_testInterfaces->accessibilityController()->shouldLogAccessibilityEvents()) {
         string message("AccessibilityNotification - ");
         message += notificationName;
 
         WebKit::WebNode node = obj.node();
@@ skipping 574 matching lines @@
 
 void WebTestProxyBase::resetInputMethod()
 {
     // If a composition text exists, then we need to let the browser process
     // to cancel the input method's ongoing composition session.
     if (m_webWidget)
         m_webWidget->confirmComposition();
 }
 
 }