Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1543)

Unified Diff: Source/testing/runner/WebTestProxy.cpp

Issue 22331005: Clean up accessibility enums for use in Chromium. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: reupload Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/testing/runner/WebTestProxy.cpp
diff --git a/Source/testing/runner/WebTestProxy.cpp b/Source/testing/runner/WebTestProxy.cpp
index 7e2dd3becda02953f3018bee6225ed2b7c7d1eb5..e3f43f0a332692942a50559b84f6524325487993 100644
--- a/Source/testing/runner/WebTestProxy.cpp
+++ b/Source/testing/runner/WebTestProxy.cpp
@@ -49,7 +49,7 @@
#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"
@@ -818,75 +818,93 @@ 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:
- notificationName = "LayoutComplete";
- break;
- case WebKit::WebAccessibilityNotificationLoadComplete:
- notificationName = "LoadComplete";
+ case WebKit::AXHide:
+ notificationName = "Hide";
break;
- case WebKit::WebAccessibilityNotificationSelectedChildrenChanged:
- notificationName = "SelectedChildrenChanged";
+ case WebKit::AXInvalidStatusChanged:
+ notificationName = "InvalidStatusChanged";
break;
- case WebKit::WebAccessibilityNotificationSelectedTextChanged:
- notificationName = "SelectedTextChanged";
+ case WebKit::AXLayoutComplete:
+ notificationName = "LayoutComplete";
break;
- case WebKit::WebAccessibilityNotificationValueChanged:
- notificationName = "ValueChanged";
+ case WebKit::AXLiveRegionChanged:
+ notificationName = "LiveRegionChanged";
break;
- case WebKit::WebAccessibilityNotificationScrolledToAnchor:
- notificationName = "ScrolledToAnchor";
+ case WebKit::AXLoadComplete:
+ notificationName = "LoadComplete";
break;
- case WebKit::WebAccessibilityNotificationLiveRegionChanged:
- notificationName = "LiveRegionChanged";
+ case WebKit::AXLocationChanged:
+ notificationName = "LocationChanged";
break;
- case WebKit::WebAccessibilityNotificationMenuListItemSelected:
+ case WebKit::AXMenuListItemSelected:
notificationName = "MenuListItemSelected";
break;
- case WebKit::WebAccessibilityNotificationMenuListValueChanged:
+ case WebKit::AXMenuListValueChanged:
notificationName = "MenuListValueChanged";
break;
- case WebKit::WebAccessibilityNotificationRowCountChanged:
- notificationName = "RowCountChanged";
- break;
- case WebKit::WebAccessibilityNotificationRowCollapsed:
+ case WebKit::AXRowCollapsed:
notificationName = "RowCollapsed";
break;
- case WebKit::WebAccessibilityNotificationRowExpanded:
+ case WebKit::AXRowCountChanged:
+ notificationName = "RowCountChanged";
+ break;
+ case WebKit::AXRowExpanded:
notificationName = "RowExpanded";
break;
- case WebKit::WebAccessibilityNotificationInvalidStatusChanged:
- notificationName = "InvalidStatusChanged";
+ case WebKit::AXScrolledToAnchor:
+ notificationName = "ScrolledToAnchor";
+ break;
+ case WebKit::AXSelectedChildrenChanged:
+ notificationName = "SelectedChildrenChanged";
break;
- case WebKit::WebAccessibilityNotificationTextChanged:
+ case WebKit::AXSelectedTextChanged:
+ notificationName = "SelectedTextChanged";
+ break;
+ case WebKit::AXShow:
+ notificationName = "Show";
+ break;
+ 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;
}

Powered by Google App Engine
This is Rietveld 408576698