[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
cfleizach at apple.com
cfleizach at apple.com
Wed Dec 22 13:23:10 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 9403f0c0527b1121b49b1e18131717c3e22e25bf
Author: cfleizach at apple.com <cfleizach at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Sep 13 21:06:45 2010 +0000
AX: accessibilityIsIgnored is returning nil when return value expects a BOOL
https://bugs.webkit.org/show_bug.cgi?id=45548
Reviewed by David Kilzer.
WebCore:
Test: platform/mac/accessibility/element-is-ignored.html
* accessibility/mac/AccessibilityObjectWrapper.mm:
(-[AccessibilityObjectWrapper accessibilityIsIgnored]):
WebKitTools:
* DumpRenderTree/AccessibilityUIElement.cpp:
(isIgnoredCallback):
(AccessibilityUIElement::getJSClass):
* DumpRenderTree/AccessibilityUIElement.h:
* DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp:
(AccessibilityUIElement::isIgnored):
* DumpRenderTree/mac/AccessibilityUIElementMac.mm:
(AccessibilityUIElement::isIgnored):
* DumpRenderTree/win/AccessibilityUIElementWin.cpp:
(AccessibilityUIElement::isIgnored):
LayoutTests:
* platform/mac/accessibility/element-is-ignored-expected.txt: Added.
* platform/mac/accessibility/element-is-ignored.html: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67408 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 10c4f5a..8af344b 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,15 @@
2010-09-13 Chris Fleizach <cfleizach at apple.com>
+ Reviewed by David Kilzer.
+
+ AX: accessibilityIsIgnored is returning nil when return value expects a BOOL
+ https://bugs.webkit.org/show_bug.cgi?id=45548
+
+ * platform/mac/accessibility/element-is-ignored-expected.txt: Added.
+ * platform/mac/accessibility/element-is-ignored.html: Added.
+
+2010-09-13 Chris Fleizach <cfleizach at apple.com>
+
Reviewed by Darin Adler.
CrashTracer: 874 crashes in Safari at com.apple.WebCore: WebCore::AccessibilityTable::isTableExposableThroughAccessibility + 663
diff --git a/LayoutTests/platform/mac/accessibility/element-is-ignored-expected.txt b/LayoutTests/platform/mac/accessibility/element-is-ignored-expected.txt
new file mode 100644
index 0000000..22330d7
--- /dev/null
+++ b/LayoutTests/platform/mac/accessibility/element-is-ignored-expected.txt
@@ -0,0 +1,12 @@
+test test
+This tests that if you access an element that has been removed, it return the correct value for isIgnored (true, that is, it is ignored).
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS element1.isIgnored is false
+PASS element1.isIgnored is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/platform/mac/accessibility/element-is-ignored.html b/LayoutTests/platform/mac/accessibility/element-is-ignored.html
new file mode 100644
index 0000000..122676f
--- /dev/null
+++ b/LayoutTests/platform/mac/accessibility/element-is-ignored.html
@@ -0,0 +1,42 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<link rel="stylesheet" href="../../../fast/js/resources/js-test-style.css">
+<script>
+var successfullyParsed = false;
+</script>
+<script src="../../../fast/js/resources/js-test-pre.js"></script>
+</head>
+<body id="body">
+
+test
+
+<div id="element1" role="group" tabindex="0">text</div>
+
+test
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This tests that if you access an element that has been removed, it return the correct value for isIgnored (true, that is, it is ignored).");
+
+ if (window.accessibilityController) {
+ document.getElementById("element1").focus();
+ var element1 = accessibilityController.focusedElement;
+
+ // The element should not be ignored (it should be a group)
+ shouldBeFalse("element1.isIgnored");
+
+ // Remove the element, it should become ignored
+ document.getElementById("body").removeChild(document.getElementById("element1"));
+ shouldBeTrue("element1.isIgnored");
+ }
+
+ successfullyParsed = true;
+</script>
+
+<script src="../../../fast/js/resources/js-test-post.js"></script>
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 17c3aec..e8cbad0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,17 @@
2010-09-13 Chris Fleizach <cfleizach at apple.com>
+ Reviewed by David Kilzer.
+
+ AX: accessibilityIsIgnored is returning nil when return value expects a BOOL
+ https://bugs.webkit.org/show_bug.cgi?id=45548
+
+ Test: platform/mac/accessibility/element-is-ignored.html
+
+ * accessibility/mac/AccessibilityObjectWrapper.mm:
+ (-[AccessibilityObjectWrapper accessibilityIsIgnored]):
+
+2010-09-13 Chris Fleizach <cfleizach at apple.com>
+
Reviewed by Darin Adler.
CrashTracer: 874 crashes in Safari at com.apple.WebCore: WebCore::AccessibilityTable::isTableExposableThroughAccessibility + 663
diff --git a/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm b/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm
index 96a0ebc..e3e28d7 100644
--- a/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm
+++ b/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm
@@ -1972,11 +1972,11 @@ static NSString* roleValueToNSString(AccessibilityRole value)
- (BOOL)accessibilityIsIgnored
{
if (!m_object)
- return nil;
+ return YES;
m_object->updateBackingStore();
if (!m_object)
- return nil;
+ return YES;
if (m_object->isAttachment())
return [[self attachmentView] accessibilityIsIgnored];
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 64f640d..61302f7 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,21 @@
+2010-09-13 Chris Fleizach <cfleizach at apple.com>
+
+ Reviewed by David Kilzer.
+
+ AX: accessibilityIsIgnored is returning nil when return value expects a BOOL
+ https://bugs.webkit.org/show_bug.cgi?id=45548
+
+ * DumpRenderTree/AccessibilityUIElement.cpp:
+ (isIgnoredCallback):
+ (AccessibilityUIElement::getJSClass):
+ * DumpRenderTree/AccessibilityUIElement.h:
+ * DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp:
+ (AccessibilityUIElement::isIgnored):
+ * DumpRenderTree/mac/AccessibilityUIElementMac.mm:
+ (AccessibilityUIElement::isIgnored):
+ * DumpRenderTree/win/AccessibilityUIElementWin.cpp:
+ (AccessibilityUIElement::isIgnored):
+
2010-09-13 Csaba Osztrogonác <ossy at webkit.org>
Reviewed by Andreas Kling.
diff --git a/WebKitTools/DumpRenderTree/AccessibilityUIElement.cpp b/WebKitTools/DumpRenderTree/AccessibilityUIElement.cpp
index 5b5240a..13c642a 100644
--- a/WebKitTools/DumpRenderTree/AccessibilityUIElement.cpp
+++ b/WebKitTools/DumpRenderTree/AccessibilityUIElement.cpp
@@ -674,6 +674,11 @@ static JSValueRef getIsCollapsedCallback(JSContextRef context, JSObjectRef thisO
return JSValueMakeBoolean(context, toAXElement(thisObject)->isCollapsed());
}
+static JSValueRef isIgnoredCallback(JSContextRef context, JSObjectRef thisObject, JSStringRef, JSValueRef*)
+{
+ return JSValueMakeBoolean(context, toAXElement(thisObject)->isIgnored());
+}
+
static JSValueRef getHasPopupCallback(JSContextRef context, JSObjectRef thisObject, JSStringRef, JSValueRef*)
{
return JSValueMakeBoolean(context, toAXElement(thisObject)->hasPopup());
@@ -831,6 +836,7 @@ JSClassRef AccessibilityUIElement::getJSClass()
{ "orientation", getOrientationCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "ariaIsGrabbed", getARIAIsGrabbedCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "ariaDropEffects", getARIADropEffectsCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
+ { "isIgnored", isIgnoredCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ 0, 0, 0, 0 }
};
diff --git a/WebKitTools/DumpRenderTree/AccessibilityUIElement.h b/WebKitTools/DumpRenderTree/AccessibilityUIElement.h
index 2cee2c3..5170f20 100644
--- a/WebKitTools/DumpRenderTree/AccessibilityUIElement.h
+++ b/WebKitTools/DumpRenderTree/AccessibilityUIElement.h
@@ -138,6 +138,7 @@ public:
bool isVisible() const;
bool isOffScreen() const;
bool isCollapsed() const;
+ bool isIgnored() const;
bool hasPopup() const;
int hierarchicalLevel() const;
double clickPointX();
diff --git a/WebKitTools/DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp b/WebKitTools/DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp
index a5c5e9f..d39ff1e 100644
--- a/WebKitTools/DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp
@@ -667,6 +667,12 @@ bool AccessibilityUIElement::isCollapsed() const
return false;
}
+bool AccessibilityUIElement::isIgnored() const
+{
+ // FIXME: implement
+ return false;
+}
+
bool AccessibilityUIElement::hasPopup() const
{
// FIXME: implement
diff --git a/WebKitTools/DumpRenderTree/mac/AccessibilityUIElementMac.mm b/WebKitTools/DumpRenderTree/mac/AccessibilityUIElementMac.mm
index 9b2443c..5f9705a 100644
--- a/WebKitTools/DumpRenderTree/mac/AccessibilityUIElementMac.mm
+++ b/WebKitTools/DumpRenderTree/mac/AccessibilityUIElementMac.mm
@@ -1160,6 +1160,15 @@ bool AccessibilityUIElement::isCollapsed() const
return false;
}
+bool AccessibilityUIElement::isIgnored() const
+{
+ BOOL result = NO;
+ BEGIN_AX_OBJC_EXCEPTIONS
+ result = [m_element accessibilityIsIgnored];
+ END_AX_OBJC_EXCEPTIONS
+ return result;
+}
+
bool AccessibilityUIElement::hasPopup() const
{
BEGIN_AX_OBJC_EXCEPTIONS
diff --git a/WebKitTools/DumpRenderTree/win/AccessibilityUIElementWin.cpp b/WebKitTools/DumpRenderTree/win/AccessibilityUIElementWin.cpp
index 8c2fea2..96937fd 100644
--- a/WebKitTools/DumpRenderTree/win/AccessibilityUIElementWin.cpp
+++ b/WebKitTools/DumpRenderTree/win/AccessibilityUIElementWin.cpp
@@ -614,6 +614,12 @@ bool AccessibilityUIElement::isCollapsed() const
return (state & STATE_SYSTEM_COLLAPSED) == STATE_SYSTEM_COLLAPSED;
}
+bool AccessibilityUIElement::isIgnored() const
+{
+ // FIXME: implement
+ return false;
+}
+
bool AccessibilityUIElement::hasPopup() const
{
DWORD state = accessibilityState(m_element);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list