Diff
Modified: trunk/Source/WebCore/ChangeLog (91173 => 91174)
--- trunk/Source/WebCore/ChangeLog 2011-07-18 06:30:31 UTC (rev 91173)
+++ trunk/Source/WebCore/ChangeLog 2011-07-18 07:34:20 UTC (rev 91174)
@@ -1,3 +1,30 @@
+2011-07-18 Sheriff Bot <[email protected]>
+
+ 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 <[email protected]>
Implement CSSPropertyCursor in CSSStyleApplyProperty
Modified: trunk/Source/WebCore/accessibility/AXObjectCache.h (91173 => 91174)
--- trunk/Source/WebCore/accessibility/AXObjectCache.h 2011-07-18 06:30:31 UTC (rev 91173)
+++ trunk/Source/WebCore/accessibility/AXObjectCache.h 2011-07-18 07:34:20 UTC (rev 91174)
@@ -129,7 +129,6 @@
AXValueChanged,
AXScrolledToAnchor,
AXLiveRegionChanged,
- AXMenuListItemSelected,
AXMenuListValueChanged,
AXRowCountChanged,
AXRowCollapsed,
Modified: trunk/Source/WebCore/accessibility/AccessibilityMenuList.cpp (91173 => 91174)
--- trunk/Source/WebCore/accessibility/AccessibilityMenuList.cpp 2011-07-18 06:30:31 UTC (rev 91173)
+++ trunk/Source/WebCore/accessibility/AccessibilityMenuList.cpp 2011-07-18 07:34:20 UTC (rev 91174)
@@ -82,22 +82,4 @@
return !static_cast<RenderMenuList*>(m_renderer)->popupIsVisible();
}
-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
Modified: trunk/Source/WebCore/accessibility/AccessibilityMenuList.h (91173 => 91174)
--- trunk/Source/WebCore/accessibility/AccessibilityMenuList.h 2011-07-18 06:30:31 UTC (rev 91173)
+++ trunk/Source/WebCore/accessibility/AccessibilityMenuList.h 2011-07-18 07:34:20 UTC (rev 91174)
@@ -42,8 +42,6 @@
virtual bool isCollapsed() const;
virtual bool press() const;
- void didUpdateActiveOption(int optionIndex);
-
private:
AccessibilityMenuList(RenderMenuList*);
Modified: trunk/Source/WebCore/accessibility/AccessibilityMenuListPopup.cpp (91173 => 91174)
--- trunk/Source/WebCore/accessibility/AccessibilityMenuListPopup.cpp 2011-07-18 06:30:31 UTC (rev 91173)
+++ trunk/Source/WebCore/accessibility/AccessibilityMenuListPopup.cpp 2011-07-18 07:34:20 UTC (rev 91174)
@@ -123,17 +123,4 @@
m_menuList = menuList;
}
-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
Modified: trunk/Source/WebCore/accessibility/AccessibilityMenuListPopup.h (91173 => 91174)
--- trunk/Source/WebCore/accessibility/AccessibilityMenuListPopup.h 2011-07-18 06:30:31 UTC (rev 91173)
+++ trunk/Source/WebCore/accessibility/AccessibilityMenuListPopup.h 2011-07-18 07:34:20 UTC (rev 91174)
@@ -33,7 +33,6 @@
class AccessibilityMenuList;
class AccessibilityMenuListOption;
class HTMLElement;
-class HTMLSelectElement;
class AccessibilityMenuListPopup : public AccessibilityObject {
public:
@@ -44,8 +43,6 @@
virtual bool isEnabled() const;
virtual bool isOffScreen() const;
- void didUpdateActiveOption(int optionIndex);
-
private:
AccessibilityMenuListPopup();
Modified: trunk/Source/WebCore/accessibility/chromium/AXObjectCacheChromium.cpp (91173 => 91174)
--- trunk/Source/WebCore/accessibility/chromium/AXObjectCacheChromium.cpp 2011-07-18 06:30:31 UTC (rev 91173)
+++ trunk/Source/WebCore/accessibility/chromium/AXObjectCacheChromium.cpp 2011-07-18 07:34:20 UTC (rev 91174)
@@ -87,7 +87,6 @@
case AXLayoutComplete:
case AXLiveRegionChanged:
case AXLoadComplete:
- case AXMenuListItemSelected:
case AXMenuListValueChanged:
case AXRowCollapsed:
case AXRowCountChanged:
Modified: trunk/Source/WebCore/accessibility/win/AXObjectCacheWin.cpp (91173 => 91174)
--- trunk/Source/WebCore/accessibility/win/AXObjectCacheWin.cpp 2011-07-18 06:30:31 UTC (rev 91173)
+++ trunk/Source/WebCore/accessibility/win/AXObjectCacheWin.cpp 2011-07-18 07:34:20 UTC (rev 91174)
@@ -88,10 +88,6 @@
msaaEvent = EVENT_OBJECT_VALUECHANGE;
break;
- case AXMenuListItemSelected:
- msaaEvent = EVENT_OBJECT_SELECTION;
- break;
-
default:
return;
}
Modified: trunk/Source/WebCore/dom/SelectElement.cpp (91173 => 91174)
--- trunk/Source/WebCore/dom/SelectElement.cpp 2011-07-18 06:30:31 UTC (rev 91173)
+++ trunk/Source/WebCore/dom/SelectElement.cpp 2011-07-18 07:34:20 UTC (rev 91174)
@@ -390,7 +390,7 @@
RenderObject* renderer = element->renderer();
if (renderer) {
if (data.usesMenuList())
- toRenderMenuList(renderer)->didSetSelectedIndex(listIndex);
+ toRenderMenuList(renderer)->didSetSelectedIndex();
else if (renderer->isListBox())
toRenderListBox(renderer)->selectionChanged();
}
Modified: trunk/Source/WebCore/rendering/RenderMenuList.cpp (91173 => 91174)
--- trunk/Source/WebCore/rendering/RenderMenuList.cpp 2011-07-18 06:30:31 UTC (rev 91173)
+++ trunk/Source/WebCore/rendering/RenderMenuList.cpp 2011-07-18 07:34:20 UTC (rev 91174)
@@ -26,7 +26,6 @@
#include "RenderMenuList.h"
#include "AXObjectCache.h"
-#include "AccessibilityMenuList.h"
#include "CSSFontSelector.h"
#include "CSSStyleSelector.h"
#include "Chrome.h"
@@ -58,7 +57,7 @@
, m_innerBlock(0)
, m_optionsChanged(true)
, m_optionsWidth(0)
- , m_lastActiveIndex(-1)
+ , m_lastSelectedIndex(-1)
, m_popupIsVisible(false)
{
}
@@ -205,7 +204,6 @@
}
setText(text.stripWhiteSpace());
- didUpdateActiveOption(optionIndex);
}
void RenderMenuList::setText(const String& s)
@@ -340,29 +338,16 @@
}
#endif
-void RenderMenuList::didSetSelectedIndex(int listIndex)
+void RenderMenuList::didSetSelectedIndex()
{
- SelectElement* select = toSelectElement(static_cast<Element*>(node()));
- didUpdateActiveOption(select->listToOptionIndex(listIndex));
-}
-
-void RenderMenuList::didUpdateActiveOption(int optionIndex)
-{
- if (!AXObjectCache::accessibilityEnabled())
+ int index = selectedIndex();
+ if (m_lastSelectedIndex == index)
return;
- if (m_lastActiveIndex == optionIndex)
- return;
- m_lastActiveIndex = optionIndex;
+ m_lastSelectedIndex = index;
- 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);
+ if (AXObjectCache::accessibilityEnabled())
+ document()->axObjectCache()->postNotification(this, AXObjectCache::AXMenuListValueChanged, true, PostSynchronously);
}
String RenderMenuList::itemText(unsigned listIndex) const
Modified: trunk/Source/WebCore/rendering/RenderMenuList.h (91173 => 91174)
--- trunk/Source/WebCore/rendering/RenderMenuList.h 2011-07-18 06:30:31 UTC (rev 91173)
+++ trunk/Source/WebCore/rendering/RenderMenuList.h 2011-07-18 07:34:20 UTC (rev 91174)
@@ -55,7 +55,7 @@
void setOptionsChanged(bool changed) { m_optionsChanged = changed; }
- void didSetSelectedIndex(int listIndex);
+ void didSetSelectedIndex();
String text() const;
@@ -124,15 +124,13 @@
void setTextFromOption(int optionIndex);
void updateOptionsWidth();
- void didUpdateActiveOption(int optionIndex);
-
RenderText* m_buttonText;
RenderBlock* m_innerBlock;
bool m_optionsChanged;
int m_optionsWidth;
- int m_lastActiveIndex;
+ int m_lastSelectedIndex;
RefPtr<RenderStyle> m_optionStyle;
Modified: trunk/Tools/ChangeLog (91173 => 91174)
--- trunk/Tools/ChangeLog 2011-07-18 06:30:31 UTC (rev 91173)
+++ trunk/Tools/ChangeLog 2011-07-18 07:34:20 UTC (rev 91174)
@@ -1,3 +1,21 @@
+2011-07-18 Sheriff Bot <[email protected]>
+
+ 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 <[email protected]>
test-webkitpy failing with Python 2.5
Modified: trunk/Tools/DumpRenderTree/AccessibilityController.h (91173 => 91174)
--- trunk/Tools/DumpRenderTree/AccessibilityController.h 2011-07-18 06:30:31 UTC (rev 91173)
+++ trunk/Tools/DumpRenderTree/AccessibilityController.h 2011-07-18 07:34:20 UTC (rev 91174)
@@ -66,7 +66,6 @@
HWINEVENTHOOK m_scrollingStartEventHook;
HWINEVENTHOOK m_allEventsHook;
- HWINEVENTHOOK m_notificationsEventHook;
HashMap<PlatformUIElement, JSObjectRef> m_notificationListeners;
#endif
};
Modified: trunk/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp (91173 => 91174)
--- trunk/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp 2011-07-18 06:30:31 UTC (rev 91173)
+++ trunk/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp 2011-07-18 07:34:20 UTC (rev 91174)
@@ -44,18 +44,16 @@
, m_scrollingStartEventHook(0)
, m_valueChangeEventHook(0)
, m_allEventsHook(0)
- , m_notificationsEventHook(0)
{
}
AccessibilityController::~AccessibilityController()
{
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)
JSValueUnprotect(frame->globalContext(), it->second);
@@ -132,10 +130,6 @@
printf("Received focus event for object '%S'.\n", name.c_str());
break;
- case EVENT_OBJECT_SELECTION:
- printf("Received selection event for object '%S'.\n", name.c_str());
- break;
-
case EVENT_OBJECT_VALUECHANGE: {
BSTR valueBSTR;
hr = parentObject->get_accValue(vChild, &valueBSTR);
@@ -219,24 +213,8 @@
ASSERT(m_scrollingStartEventHook);
}
-void AccessibilityController::setLogAccessibilityEvents(bool logAccessibilityEvents)
+void AccessibilityController::setLogAccessibilityEvents(bool)
{
- 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);
}
static string stringEvent(DWORD event)
@@ -313,8 +291,8 @@
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);
m_notificationListeners.add(element, functionCallback);
