Changeset 91174 in webkit

Timestamp:

Jul 18, 2011 12:34:20 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r91132 and r91135.
​http://trac.webkit.org/changeset/91132
​http://trac.webkit.org/changeset/91135
​https://bugs.webkit.org/show_bug.cgi?id=64681

Broke GTK and Chromium debug bots (Requested by rniwa on
#webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2011-07-18

Source/WebCore:

• accessibility/AXObjectCache.h:
• accessibility/AccessibilityMenuList.cpp:
• accessibility/AccessibilityMenuList.h:
• accessibility/AccessibilityMenuListPopup.cpp:
• accessibility/AccessibilityMenuListPopup.h:
• accessibility/chromium/AXObjectCacheChromium.cpp:

(WebCore::AXObjectCache::postPlatformNotification):

• accessibility/win/AXObjectCacheWin.cpp:

(WebCore::AXObjectCache::postPlatformNotification):

• dom/SelectElement.cpp:

(WebCore::SelectElement::setSelectedIndex):

• rendering/RenderMenuList.cpp:

(WebCore::RenderMenuList::RenderMenuList):
(WebCore::RenderMenuList::setTextFromOption):
(WebCore::RenderMenuList::didSetSelectedIndex):

• rendering/RenderMenuList.h:

Tools:

• DumpRenderTree/AccessibilityController.h:
• DumpRenderTree/win/AccessibilityControllerWin.cpp:

(AccessibilityController::AccessibilityController):
(AccessibilityController::~AccessibilityController):
(logEventProc):
(AccessibilityController::setLogAccessibilityEvents):
(AccessibilityController::addNotificationListener):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/AXObjectCache.h (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityMenuList.cpp (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityMenuList.h (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityMenuListPopup.cpp (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityMenuListPopup.h (modified) (2 diffs)
• Source/WebCore/accessibility/chromium/AXObjectCacheChromium.cpp (modified) (1 diff)
• Source/WebCore/accessibility/win/AXObjectCacheWin.cpp (modified) (1 diff)
• Source/WebCore/dom/SelectElement.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderMenuList.cpp (modified) (4 diffs)
• Source/WebCore/rendering/RenderMenuList.h (modified) (3 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/AccessibilityController.h (modified) (1 diff)
• Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-18  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r91132 and r91135.
+        http://trac.webkit.org/changeset/91132
+        http://trac.webkit.org/changeset/91135
+        https://bugs.webkit.org/show_bug.cgi?id=64681
+
+        Broke GTK and Chromium debug bots (Requested by rniwa on
+        #webkit).
+
+        * accessibility/AXObjectCache.h:
+        * accessibility/AccessibilityMenuList.cpp:
+        * accessibility/AccessibilityMenuList.h:
+        * accessibility/AccessibilityMenuListPopup.cpp:
+        * accessibility/AccessibilityMenuListPopup.h:
+        * accessibility/chromium/AXObjectCacheChromium.cpp:
+        (WebCore::AXObjectCache::postPlatformNotification):
+        * accessibility/win/AXObjectCacheWin.cpp:
+        (WebCore::AXObjectCache::postPlatformNotification):
+        * dom/SelectElement.cpp:
+        (WebCore::SelectElement::setSelectedIndex):
+        * rendering/RenderMenuList.cpp:
+        (WebCore::RenderMenuList::RenderMenuList):
+        (WebCore::RenderMenuList::setTextFromOption):
+        (WebCore::RenderMenuList::didSetSelectedIndex):
+        * rendering/RenderMenuList.h:
+
 2011-07-17  Luke Macpherson   <macpherson@chromium.org>
 

trunk/Source/WebCore/accessibility/AXObjectCache.h

@@ -130 +130 @@
         AXScrolledToAnchor,
         AXLiveRegionChanged,
-        AXMenuListItemSelected,
         AXMenuListValueChanged,
         AXRowCountChanged,

trunk/Source/WebCore/accessibility/AccessibilityMenuList.cpp

@@ -83 +83 @@
 }
 
-void AccessibilityMenuList::didUpdateActiveOption(int optionIndex)
-{
-    const AccessibilityChildrenVector& childObjects = children();
-    if (childObjects.isEmpty())
-        return;
-
-    ASSERT(childObjects.size() == 1);
-    ASSERT(childObjects[0]->isMenuListPopup());
-
-    RefPtr<Document> document = m_renderer->document();
-    AXObjectCache* cache = document->axObjectCache();
-
-    if (AccessibilityMenuListPopup* popup = static_cast<AccessibilityMenuListPopup*>(childObjects[0].get()))
-        popup->didUpdateActiveOption(optionIndex);
-
-    cache->postNotification(this, document.get(), AXObjectCache::AXMenuListValueChanged, true, PostSynchronously);
-}
-
 } // namespace WebCore

trunk/Source/WebCore/accessibility/AccessibilityMenuList.h

@@ -43 +43 @@
     virtual bool press() const;
 
-    void didUpdateActiveOption(int optionIndex);
-
 private:
     AccessibilityMenuList(RenderMenuList*);

trunk/Source/WebCore/accessibility/AccessibilityMenuListPopup.cpp

@@ -124 +124 @@
 }
 
-void AccessibilityMenuListPopup::didUpdateActiveOption(int optionIndex)
-{
-    ASSERT_ARG(optionIndex, optionIndex >= 0);
-    ASSERT_ARG(optionIndex, optionIndex < static_cast<int>(m_children.size()));
-
-    RefPtr<Document> document = m_menuList->renderer()->document();
-    AXObjectCache* cache = document->axObjectCache();
-    RefPtr<AccessibilityObject> child = m_children[optionIndex].get();
-
-    cache->postNotification(child.get(), document.get(), AXObjectCache::AXFocusedUIElementChanged, true, PostSynchronously);
-    cache->postNotification(child.get(), document.get(), AXObjectCache::AXMenuListItemSelected, true, PostSynchronously);
-}
-
 } // namespace WebCore

trunk/Source/WebCore/accessibility/AccessibilityMenuListPopup.h

@@ -34 +34 @@
 class AccessibilityMenuListOption;
 class HTMLElement;
-class HTMLSelectElement;
 
 class AccessibilityMenuListPopup : public AccessibilityObject {
@@ -44 +43 @@
     virtual bool isEnabled() const;
     virtual bool isOffScreen() const;
-
-    void didUpdateActiveOption(int optionIndex);
 
 private:

trunk/Source/WebCore/accessibility/chromium/AXObjectCacheChromium.cpp

@@ -88 +88 @@
     case AXLiveRegionChanged:
     case AXLoadComplete:
-    case AXMenuListItemSelected:
     case AXMenuListValueChanged:
     case AXRowCollapsed:

trunk/Source/WebCore/accessibility/win/AXObjectCacheWin.cpp

@@ -89 +89 @@
             break;
 
-        case AXMenuListItemSelected:
-            msaaEvent = EVENT_OBJECT_SELECTION;
-            break;
-
         default:
             return;

trunk/Source/WebCore/dom/SelectElement.cpp

@@ -391 +391 @@
         if (renderer) {
             if (data.usesMenuList())
-                toRenderMenuList(renderer)->didSetSelectedIndex(listIndex);
+                toRenderMenuList(renderer)->didSetSelectedIndex();
             else if (renderer->isListBox())
                 toRenderListBox(renderer)->selectionChanged();

trunk/Source/WebCore/rendering/RenderMenuList.cpp

@@ -27 +27 @@
 
 #include "AXObjectCache.h"
-#include "AccessibilityMenuList.h"
 #include "CSSFontSelector.h"
 #include "CSSStyleSelector.h"
@@ -59 +58 @@
     , m_optionsChanged(true)
     , m_optionsWidth(0)
-    , m_lastActiveIndex(-1)
+    , m_lastSelectedIndex(-1)
     , m_popupIsVisible(false)
 {
@@ -206 +205 @@
 
     setText(text.stripWhiteSpace());
-    didUpdateActiveOption(optionIndex);
 }
 
@@ -341 +339 @@
 #endif
 
-void RenderMenuList::didSetSelectedIndex(int listIndex)
-{
-    SelectElement* select = toSelectElement(static_cast<Element*>(node()));
-    didUpdateActiveOption(select->listToOptionIndex(listIndex));
-}
-
-void RenderMenuList::didUpdateActiveOption(int optionIndex)
-{
-    if (!AXObjectCache::accessibilityEnabled())
+void RenderMenuList::didSetSelectedIndex()
+{
+    int index = selectedIndex();
+    if (m_lastSelectedIndex == index)
         return;
 
-    if (m_lastActiveIndex == optionIndex)
-        return;
-    m_lastActiveIndex = optionIndex;
-
-    SelectElement* select = toSelectElement(static_cast<Element*>(node()));
-    if (optionIndex < 0 || optionIndex > static_cast<int>(select->listItems().size()))
-        return;
-
-    ASSERT(toOptionElement(select->listItems()[optionIndex]));
-
-    if (AccessibilityMenuList* menuList = static_cast<AccessibilityMenuList*>(document()->axObjectCache()->get(this)))
-        menuList->didUpdateActiveOption(optionIndex);
+    m_lastSelectedIndex = index;
+
+    if (AXObjectCache::accessibilityEnabled())
+        document()->axObjectCache()->postNotification(this, AXObjectCache::AXMenuListValueChanged, true, PostSynchronously);
 }
 

trunk/Source/WebCore/rendering/RenderMenuList.h

@@ -56 +56 @@
     void setOptionsChanged(bool changed) { m_optionsChanged = changed; }
 
-    void didSetSelectedIndex(int listIndex);
+    void didSetSelectedIndex();
 
     String text() const;
@@ -125 +125 @@
     void updateOptionsWidth();
 
-    void didUpdateActiveOption(int optionIndex);
-
     RenderText* m_buttonText;
     RenderBlock* m_innerBlock;
@@ -133 +131 @@
     int m_optionsWidth;
 
-    int m_lastActiveIndex;
+    int m_lastSelectedIndex;
 
     RefPtr<RenderStyle> m_optionStyle;

trunk/Tools/ChangeLog

@@ +1 @@
+2011-07-18  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r91132 and r91135.
+        http://trac.webkit.org/changeset/91132
+        http://trac.webkit.org/changeset/91135
+        https://bugs.webkit.org/show_bug.cgi?id=64681
+
+        Broke GTK and Chromium debug bots (Requested by rniwa on
+        #webkit).
+
+        * DumpRenderTree/AccessibilityController.h:
+        * DumpRenderTree/win/AccessibilityControllerWin.cpp:
+        (AccessibilityController::AccessibilityController):
+        (AccessibilityController::~AccessibilityController):
+        (logEventProc):
+        (AccessibilityController::setLogAccessibilityEvents):
+        (AccessibilityController::addNotificationListener):
+
 2011-07-17  Philippe Normand  <pnormand@igalia.com>
 

trunk/Tools/DumpRenderTree/AccessibilityController.h

@@ -67 +67 @@
 
     HWINEVENTHOOK m_allEventsHook;
-    HWINEVENTHOOK m_notificationsEventHook;
     HashMap<PlatformUIElement, JSObjectRef> m_notificationListeners;
 #endif

trunk/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp

@@ -45 +45 @@
     , m_valueChangeEventHook(0)
     , m_allEventsHook(0)
-    , m_notificationsEventHook(0)
 {
 }
@@ -52 +51 @@
 {
     setLogFocusEvents(false);
-    setLogAccessibilityEvents(false);
     setLogValueChangeEvents(false);
 
-    if (m_notificationsEventHook)
-        UnhookWinEvent(m_notificationsEventHook);
+    if (m_allEventsHook)
+        UnhookWinEvent(m_allEventsHook);
 
     for (HashMap<PlatformUIElement, JSObjectRef>::iterator it = m_notificationListeners.begin(); it != m_notificationListeners.end(); ++it)
@@ -133 +131 @@
             break;
 
-        case EVENT_OBJECT_SELECTION:
-            printf("Received selection event for object '%S'.\n", name.c_str());
-            break;
-
         case EVENT_OBJECT_VALUECHANGE: {
             BSTR valueBSTR;
@@ -220 +214 @@
 }
 
-void AccessibilityController::setLogAccessibilityEvents(bool logAccessibilityEvents)
-{
-    if (!!m_allEventsHook == logAccessibilityEvents)
-        return;
-
-    if (!logAccessibilityEvents) {
-        UnhookWinEvent(m_allEventsHook);
-        m_allEventsHook = 0;
-        return;
-    }
-
-    // Ensure that accessibility is initialized for the WebView by querying for
-    // the root accessible object.
-    rootElement();
-
-    m_allEventsHook = SetWinEventHook(EVENT_MIN, EVENT_MAX, GetModuleHandle(0), logEventProc, GetCurrentProcessId(), 0, WINEVENT_INCONTEXT);
-
-    ASSERT(m_allEventsHook);
+void AccessibilityController::setLogAccessibilityEvents(bool)
+{
 }
 
@@ -314 +292 @@
 void AccessibilityController::addNotificationListener(PlatformUIElement element, JSObjectRef functionCallback)
 {
-    if (!m_notificationsEventHook)
-        m_notificationsEventHook = SetWinEventHook(EVENT_MIN, EVENT_MAX, GetModuleHandle(0), notificationListenerProc, GetCurrentProcessId(), 0, WINEVENT_INCONTEXT);
+    if (!m_allEventsHook)
+        m_allEventsHook = SetWinEventHook(EVENT_MIN, EVENT_MAX, GetModuleHandle(0), notificationListenerProc, GetCurrentProcessId(), 0, WINEVENT_INCONTEXT);
 
     JSValueProtect(frame->globalContext(), functionCallback);