Clean up accessibility enums for use in Chromium.

Source/web/ChromeClientImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  *
  * 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.
@@ skipping 111 matching lines @@
     }
 }
 
 // Converts a WebCore::AXObjectCache::AXNotification to a WebKit::WebAccessibilityNotification
 static WebAccessibilityNotification toWebAccessibilityNotification(AXObjectCache::AXNotification notification)
 {
     // These enums have the same values; enforced in AssertMatchingEnums.cpp.
     return static_cast<WebAccessibilityNotification>(notification);
 }
 
+// Converts a WebCore::AXObjectCache::AXNotification to a WebKit::WebAXEvent
+static WebAXTypes::Event toWebAXEvent(AXObjectCache::AXNotification notification)
+{
+    // These enums have the same values; enforced in AssertMatchingEnums.cpp.
+    return static_cast<WebAXTypes::Event>(notification);
+}
+
 ChromeClientImpl::ChromeClientImpl(WebViewImpl* webView)
     : m_webView(webView)
     , m_toolbarsVisible(true)
     , m_statusbarVisible(true)
     , m_scrollbarsVisible(true)
     , m_menubarVisible(true)
     , m_resizable(true)
     , m_pagePopupDriver(webView)
 {
 }
@@ skipping 656 matching lines @@
     info->itemHeight = popupContainer->menuItemHeight();
     info->itemFontSize = popupContainer->menuItemFontSize();
     info->selectedIndex = popupContainer->selectedIndex();
     info->items.swap(outputItems);
     info->rightAligned = popupContainer->menuStyle().textDirection() == RTL;
 }
 
 void ChromeClientImpl::postAccessibilityNotification(AccessibilityObject* obj, AXObjectCache::AXNotification notification)
 {
     // Alert assistive technology about the accessibility object notification.
-    if (obj)
+    if (obj) {

[jamesr, 2013/08/21 02:22:52]

early return on !obj is more readable and requires less indentation

[dmazzoni, 2013/08/22 20:58:23]

Done.

+        // TODO(dmazzoni): remove this first call once Chromium has

[jamesr, 2013/08/21 02:22:52]

Blink style is FIXME:, not TODO(name).  You have a bug link here which is more
useful than a person.

[dmazzoni, 2013/08/22 20:58:23]

TODO changed to FIXME throughout.

+        // switched over. (http://crbug.com/269034)
         m_webView->client()->postAccessibilityNotification(WebAccessibilityObject(obj), toWebAccessibilityNotification(notification));
+        m_webView->client()->postAccessibilityEvent(WebAccessibilityObject(obj), toWebAXEvent(notification));
+    }
 }
 
 String ChromeClientImpl::acceptLanguages()
 {
     return m_webView->client()->acceptLanguages();
 }
 
 bool ChromeClientImpl::paintCustomOverhangArea(GraphicsContext* context, const IntRect& horizontalOverhangArea, const IntRect& verticalOverhangArea, const IntRect& dirtyRect)
 {
     Frame* frame = m_webView->mainFrameImpl()->frame();
@@ skipping 189 matching lines @@
 {
 }
 
 void NavigatorContentUtilsClientImpl::registerProtocolHandler(const String& scheme, const String& baseURL, const String& url, const String& title)
 {
     m_webView->client()->registerProtocolHandler(scheme, baseURL, url, title);
 }
 #endif
 
 } // namespace WebKit