<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[167913] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/167913">167913</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2014-04-28 17:31:45 -0700 (Mon, 28 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Crash in platform/mac/accessibility/table-visible-rows.html
https://bugs.webkit.org/show_bug.cgi?id=132146
Reviewed by Filip Pizlo.
Instead of creating a local JSValueRef array on the stack and passing that to
JSObjectMakeArray(), changed to create an empty JSArray and then populate the
values using the JSObjectSetPropertyAtIndex() API.
* DumpRenderTree/AccessibilityUIElement.cpp:
(elementsForRangeCallback):
(convertElementsToObjectArray):
* DumpRenderTree/mac/TestRunnerMac.mm:
(originsArrayToJS):
* WebKitTestRunner/InjectedBundle/EventSendingController.cpp:
(WTR::EventSendingController::contextClick):
* WebKitTestRunner/InjectedBundle/TestRunner.cpp:
(WTR::stringArrayToJS):
* WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:
(WTR::convertElementsToObjectArray):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeAccessibilityUIElementcpp">trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreemacTestRunnerMacmm">trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleEventSendingControllercpp">trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleTestRunnercpp">trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundlemacAccessibilityUIElementMacmm">trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (167912 => 167913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-04-28 23:23:03 UTC (rev 167912)
+++ trunk/Tools/ChangeLog 2014-04-29 00:31:45 UTC (rev 167913)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-04-28 Michael Saboff <msaboff@apple.com>
+
+ Crash in platform/mac/accessibility/table-visible-rows.html
+ https://bugs.webkit.org/show_bug.cgi?id=132146
+
+ Reviewed by Filip Pizlo.
+
+ Instead of creating a local JSValueRef array on the stack and passing that to
+ JSObjectMakeArray(), changed to create an empty JSArray and then populate the
+ values using the JSObjectSetPropertyAtIndex() API.
+
+ * DumpRenderTree/AccessibilityUIElement.cpp:
+ (elementsForRangeCallback):
+ (convertElementsToObjectArray):
+ * DumpRenderTree/mac/TestRunnerMac.mm:
+ (originsArrayToJS):
+ * WebKitTestRunner/InjectedBundle/EventSendingController.cpp:
+ (WTR::EventSendingController::contextClick):
+ * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+ (WTR::stringArrayToJS):
+ * WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:
+ (WTR::convertElementsToObjectArray):
+
</ins><span class="cx"> 2014-04-28 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Make sure that the coverage of our tests doesn't change much if we change the thresholds now and in the future, but making
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeAccessibilityUIElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp (167912 => 167913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp 2014-04-28 23:23:03 UTC (rev 167912)
+++ trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp 2014-04-29 00:31:45 UTC (rev 167913)
</span><span class="lines">@@ -312,12 +312,13 @@
</span><span class="cx"> Vector<AccessibilityUIElement> elements;
</span><span class="cx"> toAXElement(thisObject)->elementsForRange(location, length, elements);
</span><span class="cx">
</span><ins>+ JSValueRef arrayResult = JSObjectMakeArray(context, 0, 0, 0);
+ JSObjectRef arrayObj = JSValueToObject(context, arrayResult, 0);
</ins><span class="cx"> unsigned elementsSize = elements.size();
</span><del>- JSValueRef valueElements[elementsSize];
</del><span class="cx"> for (unsigned k = 0; k < elementsSize; ++k)
</span><del>- valueElements[k] = AccessibilityUIElement::makeJSAccessibilityUIElement(context, elements[k]);
</del><ins>+ JSObjectSetPropertyAtIndex(context, arrayObj, k, AccessibilityUIElement::makeJSAccessibilityUIElement(context, elements[k]), 0);
</ins><span class="cx">
</span><del>- return JSObjectMakeArray(context, elementsSize, valueElements, 0);
</del><ins>+ return arrayResult;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static JSValueRef increaseTextSelectionCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
</span><span class="lines">@@ -518,12 +519,14 @@
</span><span class="cx">
</span><span class="cx"> static JSValueRef convertElementsToObjectArray(JSContextRef context, Vector<AccessibilityUIElement>& elements, JSValueRef* exception)
</span><span class="cx"> {
</span><ins>+ JSValueRef arrayResult = JSObjectMakeArray(context, 0, 0, 0);
+ JSObjectRef arrayObj = JSValueToObject(context, arrayResult, 0);
+
</ins><span class="cx"> size_t elementCount = elements.size();
</span><del>- JSValueRef valueElements[elementCount];
</del><span class="cx"> for (size_t i = 0; i < elementCount; ++i)
</span><del>- valueElements[i] = AccessibilityUIElement::makeJSAccessibilityUIElement(context, elements[i]);
-
- return JSObjectMakeArray(context, elementCount, valueElements, exception);
</del><ins>+ JSObjectSetPropertyAtIndex(context, arrayObj, i, AccessibilityUIElement::makeJSAccessibilityUIElement(context, elements[i]), 0);
+
+ return arrayResult;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static JSValueRef columnHeadersCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacTestRunnerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm (167912 => 167913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm 2014-04-28 23:23:03 UTC (rev 167912)
+++ trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm 2014-04-29 00:31:45 UTC (rev 167913)
</span><span class="lines">@@ -194,14 +194,15 @@
</span><span class="cx"> {
</span><span class="cx"> NSUInteger count = [origins count];
</span><span class="cx">
</span><del>- JSValueRef jsOriginsArray[count];
</del><ins>+ JSValueRef arrayResult = JSObjectMakeArray(context, 0, 0, 0);
+ JSObjectRef arrayObj = JSValueToObject(context, arrayResult, 0);
</ins><span class="cx"> for (NSUInteger i = 0; i < count; i++) {
</span><span class="cx"> NSString *origin = [[origins objectAtIndex:i] databaseIdentifier];
</span><span class="cx"> JSRetainPtr<JSStringRef> originJS(Adopt, JSStringCreateWithCFString((CFStringRef)origin));
</span><del>- jsOriginsArray[i] = JSValueMakeString(context, originJS.get());
</del><ins>+ JSObjectSetPropertyAtIndex(context, arrayObj, i, JSValueMakeString(context, originJS.get()), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return JSObjectMakeArray(context, count, jsOriginsArray, NULL);
</del><ins>+ return arrayResult;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValueRef TestRunner::originsWithApplicationCache(JSContextRef context)
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleEventSendingControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp (167912 => 167913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp 2014-04-28 23:23:03 UTC (rev 167912)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp 2014-04-29 00:31:45 UTC (rev 167913)
</span><span class="lines">@@ -437,17 +437,18 @@
</span><span class="cx"> mouseUp(2, 0);
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKArrayRef> menuEntries = adoptWK(WKBundlePageCopyContextMenuItems(page));
</span><ins>+ JSValueRef arrayResult = JSObjectMakeArray(context, 0, 0, 0);
+ JSObjectRef arrayObj = JSValueToObject(context, arrayResult, 0);
</ins><span class="cx"> size_t entriesSize = WKArrayGetSize(menuEntries.get());
</span><del>- JSValueRef jsValuesArray[entriesSize];
</del><span class="cx"> for (size_t i = 0; i < entriesSize; ++i) {
</span><span class="cx"> ASSERT(WKGetTypeID(WKArrayGetItemAtIndex(menuEntries.get(), i)) == WKContextMenuItemGetTypeID());
</span><span class="cx">
</span><span class="cx"> WKContextMenuItemRef item = static_cast<WKContextMenuItemRef>(WKArrayGetItemAtIndex(menuEntries.get(), i));
</span><span class="cx"> MenuItemPrivateData* privateData = new MenuItemPrivateData(page, item);
</span><del>- jsValuesArray[i] = JSObjectMake(context, getMenuItemClass(), privateData);
</del><ins>+ JSObjectSetPropertyAtIndex(context, arrayObj, i, JSObjectMake(context, getMenuItemClass(), privateData), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return JSObjectMakeArray(context, entriesSize, jsValuesArray, 0);
</del><ins>+ return arrayResult;
</ins><span class="cx"> #else
</span><span class="cx"> return JSValueMakeUndefined(context);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleTestRunnercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (167912 => 167913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2014-04-28 23:23:03 UTC (rev 167912)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2014-04-29 00:31:45 UTC (rev 167913)
</span><span class="lines">@@ -275,14 +275,15 @@
</span><span class="cx"> {
</span><span class="cx"> const size_t count = WKArrayGetSize(strings);
</span><span class="cx">
</span><del>- auto jsStringsArray = std::make_unique<JSValueRef[]>(count);
</del><ins>+ JSValueRef arrayResult = JSObjectMakeArray(context, 0, 0, 0);
+ JSObjectRef arrayObj = JSValueToObject(context, arrayResult, 0);
</ins><span class="cx"> for (size_t i = 0; i < count; ++i) {
</span><span class="cx"> WKStringRef stringRef = static_cast<WKStringRef>(WKArrayGetItemAtIndex(strings, i));
</span><span class="cx"> JSRetainPtr<JSStringRef> stringJS = toJS(stringRef);
</span><del>- jsStringsArray[i] = JSValueMakeString(context, stringJS.get());
</del><ins>+ JSObjectSetPropertyAtIndex(context, arrayObj, i, JSValueMakeString(context, stringJS.get()), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return JSObjectMakeArray(context, count, jsStringsArray.get(), 0);
</del><ins>+ return arrayResult;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValueRef TestRunner::originsWithApplicationCache()
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundlemacAccessibilityUIElementMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm (167912 => 167913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm 2014-04-28 23:23:03 UTC (rev 167912)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm 2014-04-29 00:31:45 UTC (rev 167913)
</span><span class="lines">@@ -178,12 +178,13 @@
</span><span class="cx">
</span><span class="cx"> static JSValueRef convertElementsToObjectArray(JSContextRef context, Vector<RefPtr<AccessibilityUIElement>>& elements)
</span><span class="cx"> {
</span><ins>+ JSValueRef arrayResult = JSObjectMakeArray(context, 0, 0, 0);
+ JSObjectRef arrayObj = JSValueToObject(context, arrayResult, 0);
</ins><span class="cx"> size_t elementCount = elements.size();
</span><del>- JSValueRef valueElements[elementCount];
</del><span class="cx"> for (size_t i = 0; i < elementCount; ++i)
</span><del>- valueElements[i] = JSObjectMake(context, elements[i]->wrapperClass(), elements[i].get());
</del><ins>+ JSObjectSetPropertyAtIndex(context, arrayObj, i, JSObjectMake(context, elements[i]->wrapperClass(), elements[i].get()), 0);
</ins><span class="cx">
</span><del>- return JSObjectMakeArray(context, elementCount, valueElements, nullptr);
</del><ins>+ return arrayResult;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static JSStringRef concatenateAttributeAndValue(NSString* attribute, NSString* value)
</span></span></pre>
</div>
</div>
</body>
</html>