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/WebAXTypes.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::postAccessibilityEvent(const WebKit::WebAccessibilityObject& obj, WebAXTypes::Event event)
 {
-    if (notification == WebKit::WebAccessibilityNotificationFocusedUIElementChanged)
+    if (event == WebAXTypes::Focus)
         m_testInterfaces->accessibilityController()->setFocusedElement(obj);
 
-    const char* notificationName;
-    switch (notification) {
-    case WebKit::WebAccessibilityNotificationActiveDescendantChanged:
-        notificationName = "ActiveDescendantChanged";
+    const char* eventName;
+    switch (event) {
+    case WebAXTypes::ActiveDescendantChanged:
+        eventName = "ActiveDescendantChanged";
         break;
-    case WebKit::WebAccessibilityNotificationAutocorrectionOccured:
-        notificationName = "AutocorrectionOccured";
+    case WebAXTypes::Alert:
+        eventName = "Alert";
         break;
-    case WebKit::WebAccessibilityNotificationCheckedStateChanged:
-        notificationName = "CheckedStateChanged";
+    case WebAXTypes::AriaAttributeChanged:
+        eventName = "AriaAttributeChanged";
         break;
-    case WebKit::WebAccessibilityNotificationChildrenChanged:
-        notificationName = "ChildrenChanged";
+    case WebAXTypes::AutocorrectionOccured:
+        eventName = "AutocorrectionOccured";
         break;
-    case WebKit::WebAccessibilityNotificationFocusedUIElementChanged:
-        notificationName = "FocusedUIElementChanged";
+    case WebAXTypes::Blur:
+        eventName = "Blur";
         break;
-    case WebKit::WebAccessibilityNotificationLayoutComplete:
-        notificationName = "LayoutComplete";
+    case WebAXTypes::CheckedStateChanged:
+        eventName = "CheckedStateChanged";
         break;
-    case WebKit::WebAccessibilityNotificationLoadComplete:
-        notificationName = "LoadComplete";
+    case WebAXTypes::ChildrenChanged:
+        eventName = "ChildrenChanged";
         break;
-    case WebKit::WebAccessibilityNotificationSelectedChildrenChanged:
-        notificationName = "SelectedChildrenChanged";
+    case WebAXTypes::Focus:
+        eventName = "Focus";
         break;
-    case WebKit::WebAccessibilityNotificationSelectedTextChanged:
-        notificationName = "SelectedTextChanged";
+    case WebAXTypes::Hide:
+        eventName = "Hide";
         break;
-    case WebKit::WebAccessibilityNotificationValueChanged:
-        notificationName = "ValueChanged";
+    case WebAXTypes::InvalidStatusChanged:
+        eventName = "InvalidStatusChanged";
         break;
-    case WebKit::WebAccessibilityNotificationScrolledToAnchor:
-        notificationName = "ScrolledToAnchor";
+    case WebAXTypes::LayoutComplete:
+        eventName = "LayoutComplete";
         break;
-    case WebKit::WebAccessibilityNotificationLiveRegionChanged:
-        notificationName = "LiveRegionChanged";
+    case WebAXTypes::LiveRegionChanged:
+        eventName = "LiveRegionChanged";
         break;
-    case WebKit::WebAccessibilityNotificationMenuListItemSelected:
-        notificationName = "MenuListItemSelected";
+    case WebAXTypes::LoadComplete:
+        eventName = "LoadComplete";
         break;
-    case WebKit::WebAccessibilityNotificationMenuListValueChanged:
-        notificationName = "MenuListValueChanged";
+    case WebAXTypes::LocationChanged:
+        eventName = "LocationChanged";
         break;
-    case WebKit::WebAccessibilityNotificationRowCountChanged:
-        notificationName = "RowCountChanged";
+    case WebAXTypes::MenuListItemSelected:
+        eventName = "MenuListItemSelected";
         break;
-    case WebKit::WebAccessibilityNotificationRowCollapsed:
-        notificationName = "RowCollapsed";
+    case WebAXTypes::MenuListValueChanged:
+        eventName = "MenuListValueChanged";
         break;
-    case WebKit::WebAccessibilityNotificationRowExpanded:
-        notificationName = "RowExpanded";
+    case WebAXTypes::RowCollapsed:
+        eventName = "RowCollapsed";
         break;
-    case WebKit::WebAccessibilityNotificationInvalidStatusChanged:
-        notificationName = "InvalidStatusChanged";
+    case WebAXTypes::RowCountChanged:
+        eventName = "RowCountChanged";
         break;
-    case WebKit::WebAccessibilityNotificationTextChanged:
-        notificationName = "TextChanged";
+    case WebAXTypes::RowExpanded:
+        eventName = "RowExpanded";
         break;
-    case WebKit::WebAccessibilityNotificationAriaAttributeChanged:
-        notificationName = "AriaAttributeChanged";
+    case WebAXTypes::ScrolledToAnchor:
+        eventName = "ScrolledToAnchor";
         break;
-    default:
-        notificationName = "UnknownNotification";
+    case WebAXTypes::SelectedChildrenChanged:
+        eventName = "SelectedChildrenChanged";
+        break;
+    case WebAXTypes::SelectedTextChanged:
+        eventName = "SelectedTextChanged";
+        break;
+    case WebAXTypes::Show:
+        eventName = "Show";
+        break;
+    case WebAXTypes::TextChanged:
+        eventName = "TextChanged";
+        break;
+    case WebAXTypes::TextInserted:
+        eventName = "TextInserted";
+        break;
+    case WebAXTypes::TextRemoved:
+        eventName = "TextRemoved";
+        break;
+    case WebAXTypes::ValueChanged:
+        eventName = "ValueChanged";
         break;
     }
 
-    m_testInterfaces->accessibilityController()->notificationReceived(obj, notificationName);
+    m_testInterfaces->accessibilityController()->notificationReceived(obj, eventName);
 
     if (m_testInterfaces->accessibilityController()->shouldLogAccessibilityEvents()) {
         string message("AccessibilityNotification - ");
-        message += notificationName;
+        message += eventName;
 
         WebKit::WebNode node = obj.node();
         if (!node.isNull() && node.isElementNode()) {
             WebKit::WebElement element = node.to<WebKit::WebElement>();
             if (element.hasAttribute("id")) {
                 message += " - id:";
                 message += element.getAttribute("id").utf8().data();
             }
         }
 
@@ skipping 564 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();
 }
 
 }