Title: [102382] trunk
- Revision
- 102382
- Author
- cfleiz...@apple.com
- Date
- 2011-12-08 14:11:50 -0800 (Thu, 08 Dec 2011)
Log Message
Tools: AX: platform/mac/accessibility/search-with-frames.html crashes
https://bugs.webkit.org/show_bug.cgi?id=74093
Reviewed by Darin Adler.
Take care of the case when an incoming element is null.
* DumpRenderTree/AccessibilityUIElement.cpp:
(uiElementForSearchPredicateCallback):
* DumpRenderTree/mac/AccessibilityUIElementMac.mm:
(AccessibilityUIElement::uiElementForSearchPredicate):
* WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:
(WTR::AccessibilityUIElement::uiElementForSearchPredicate):
LayoutTests: platform/mac/accessibility/search-with-frames.html crashes
https://bugs.webkit.org/show_bug.cgi?id=74093
Reviewed by Darin Adler.
Unskip the crashing test.
* platform/mac/Skipped:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (102381 => 102382)
--- trunk/LayoutTests/ChangeLog 2011-12-08 22:08:51 UTC (rev 102381)
+++ trunk/LayoutTests/ChangeLog 2011-12-08 22:11:50 UTC (rev 102382)
@@ -1,3 +1,14 @@
+2011-12-08 Chris Fleizach <cfleiz...@apple.com>
+
+ platform/mac/accessibility/search-with-frames.html crashes
+ https://bugs.webkit.org/show_bug.cgi?id=74093
+
+ Reviewed by Darin Adler.
+
+ Unskip the crashing test.
+
+ * platform/mac/Skipped:
+
2011-12-08 Dominic Mazzoni <dmazz...@google.com>
Accessibility: AccessibilityController should support listening to notifications on all elements.
Modified: trunk/LayoutTests/platform/mac/Skipped (102381 => 102382)
--- trunk/LayoutTests/platform/mac/Skipped 2011-12-08 22:08:51 UTC (rev 102381)
+++ trunk/LayoutTests/platform/mac/Skipped 2011-12-08 22:11:50 UTC (rev 102382)
@@ -523,6 +523,3 @@
# https://bugs.webkit.org/show_bug.cgi?id=73974
fast/canvas/webgl/canvas-2d-webgl-texture.html
-
-# https://bugs.webkit.org/show_bug.cgi?id=74093
-platform/mac/accessibility/search-with-frames.html
Modified: trunk/Tools/ChangeLog (102381 => 102382)
--- trunk/Tools/ChangeLog 2011-12-08 22:08:51 UTC (rev 102381)
+++ trunk/Tools/ChangeLog 2011-12-08 22:11:50 UTC (rev 102382)
@@ -1,3 +1,19 @@
+2011-12-08 Chris Fleizach <cfleiz...@apple.com>
+
+ AX: platform/mac/accessibility/search-with-frames.html crashes
+ https://bugs.webkit.org/show_bug.cgi?id=74093
+
+ Reviewed by Darin Adler.
+
+ Take care of the case when an incoming element is null.
+
+ * DumpRenderTree/AccessibilityUIElement.cpp:
+ (uiElementForSearchPredicateCallback):
+ * DumpRenderTree/mac/AccessibilityUIElementMac.mm:
+ (AccessibilityUIElement::uiElementForSearchPredicate):
+ * WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:
+ (WTR::AccessibilityUIElement::uiElementForSearchPredicate):
+
2011-12-08 Alexander Færøy <a...@0x90.dk>
[Qt] Visualize mock point ID's in the MiniBrowser
Modified: trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp (102381 => 102382)
--- trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp 2011-12-08 22:08:51 UTC (rev 102381)
+++ trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp 2011-12-08 22:11:50 UTC (rev 102382)
@@ -192,7 +192,9 @@
JSStringRef searchKey = 0;
JSStringRef searchText = 0;
if (argumentCount == 4) {
- startElement = toAXElement(JSValueToObject(context, arguments[0], exception));
+ JSObjectRef startElementObject = JSValueToObject(context, arguments[0], exception);
+ if (startElementObject)
+ startElement = toAXElement(startElementObject);
isDirectionNext = JSValueToBoolean(context, arguments[1]);
if (JSValueIsString(context, arguments[2]))
searchKey = JSValueToStringCopy(context, arguments[2], exception);
Modified: trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm (102381 => 102382)
--- trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm 2011-12-08 22:08:51 UTC (rev 102381)
+++ trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm 2011-12-08 22:11:50 UTC (rev 102382)
@@ -900,7 +900,7 @@
NSMutableDictionary* parameter = [NSMutableDictionary dictionary];
[parameter setObject:(isDirectionNext) ? @"AXDirectionNext" : @"AXDirectionPrevious" forKey:@"AXDirection"];
[parameter setObject:[NSNumber numberWithInt:1] forKey:@"AXResultsLimit"];
- if (startElement)
+ if (startElement && startElement->platformUIElement())
[parameter setObject:(id)startElement->platformUIElement() forKey:@"AXStartElement"];
if (searchKey)
[parameter setObject:[NSString stringWithJSStringRef:searchKey] forKey:@"AXSearchKey"];
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm (102381 => 102382)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm 2011-12-08 22:08:51 UTC (rev 102381)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm 2011-12-08 22:11:50 UTC (rev 102382)
@@ -908,7 +908,7 @@
NSMutableDictionary* parameter = [NSMutableDictionary dictionary];
[parameter setObject:(isDirectionNext) ? @"AXDirectionNext" : @"AXDirectionPrevious" forKey:@"AXDirection"];
[parameter setObject:[NSNumber numberWithInt:1] forKey:@"AXResultsLimit"];
- if (startElement)
+ if (startElement && startElement->platformUIElement())
[parameter setObject:(id)startElement->platformUIElement() forKey:@"AXStartElement"];
if (searchKey)
[parameter setObject:[NSString stringWithJSStringRef:searchKey] forKey:@"AXSearchKey"];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
