<!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>[211460] 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/211460">211460</a></dd>
<dt>Author</dt> <dd>megan_gardner@apple.com</dd>
<dt>Date</dt> <dd>2017-01-31 17:04:03 -0800 (Tue, 31 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make Dump Render Tree not crash
https://bugs.webkit.org/show_bug.cgi?id=167667
DumpRenderTree is crashing when running WK2 tests that it's not supposed to be running.
DumpRenderTree uses RunLoop::main.dispatch(), but that crashes because it's not set up on iOS.
So we're making use of RunWebThread, which is the correct thing to do on iOS, and it doesn't crash.
This does not fix any tests, it just fixes the crash.
Reviewed by Simon Fraser.
* DumpRenderTree/TestRunner.cpp:
(TestRunner::callUIScriptCallback):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeTestRunnercpp">trunk/Tools/DumpRenderTree/TestRunner.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (211459 => 211460)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-02-01 00:39:56 UTC (rev 211459)
+++ trunk/Tools/ChangeLog 2017-02-01 01:04:03 UTC (rev 211460)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-01-31 Megan Gardner <megan_gardner@apple.com>
+
+ Make Dump Render Tree not crash
+ https://bugs.webkit.org/show_bug.cgi?id=167667
+
+ DumpRenderTree is crashing when running WK2 tests that it's not supposed to be running.
+ DumpRenderTree uses RunLoop::main.dispatch(), but that crashes because it's not set up on iOS.
+ So we're making use of RunWebThread, which is the correct thing to do on iOS, and it doesn't crash.
+ This does not fix any tests, it just fixes the crash.
+
+ Reviewed by Simon Fraser.
+
+ * DumpRenderTree/TestRunner.cpp:
+ (TestRunner::callUIScriptCallback):
+
</ins><span class="cx"> 2017-01-31 Jonathan Bedard <jbedard@apple.com>
</span><span class="cx">
</span><span class="cx"> Workaround for simctl install failing to report install failure
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeTestRunnercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/TestRunner.cpp (211459 => 211460)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/TestRunner.cpp 2017-02-01 00:39:56 UTC (rev 211459)
+++ trunk/Tools/DumpRenderTree/TestRunner.cpp 2017-02-01 01:04:03 UTC (rev 211460)
</span><span class="lines">@@ -56,6 +56,11 @@
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+#include <WebCore/WebCoreThreadRun.h>
+#include <wtf/BlockPtr.h>
+#endif
+
</ins><span class="cx"> #if PLATFORM(MAC) && !PLATFORM(IOS)
</span><span class="cx"> #include <Carbon/Carbon.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -2407,12 +2412,21 @@
</span><span class="cx"> void TestRunner::callUIScriptCallback(unsigned callbackID, JSStringRef result)
</span><span class="cx"> {
</span><span class="cx"> JSRetainPtr<JSStringRef> protectedResult(result);
</span><del>-
</del><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> RunLoop::main().dispatch([protectedThis = makeRef(*this), callbackID, protectedResult]() mutable {
</span><span class="cx"> JSContextRef context = protectedThis->mainFrameJSContext();
</span><span class="cx"> JSValueRef resultValue = JSValueMakeString(context, protectedResult.get());
</span><span class="cx"> protectedThis->callTestRunnerCallback(callbackID, 1, &resultValue);
</span><span class="cx"> });
</span><ins>+#else
+ WebThreadRun(
+ BlockPtr<void()>::fromCallable([protectedThis = makeRef(*this), callbackID, protectedResult] {
+ JSContextRef context = protectedThis->mainFrameJSContext();
+ JSValueRef resultValue = JSValueMakeString(context, protectedResult.get());
+ protectedThis->callTestRunnerCallback(callbackID, 1, &resultValue);
+ }).get()
+ );
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::uiScriptDidComplete(const String& result, unsigned callbackID)
</span></span></pre>
</div>
</div>
</body>
</html>