<!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>[244898] trunk</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/244898">244898</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2019-05-02 18:19:03 -0700 (Thu, 02 May 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Add test coverage for <rdar://problem/49731231>
https://bugs.webkit.org/show_bug.cgi?id=196730
<rdar://problem/49731231>

Reviewed by Ryosuke Niwa.

Tools:

Add support for testRunner.abortModal() in macOS's WebKitTestRunner in order
to match DumpRenderTree.

* WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
* WebKitTestRunner/InjectedBundle/TestRunner.cpp:
(WTR::TestRunner::abortModal):
* WebKitTestRunner/InjectedBundle/TestRunner.h:
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::runModal):
* WebKitTestRunner/TestController.h:
* WebKitTestRunner/TestInvocation.cpp:
(WTR::TestInvocation::didReceiveSynchronousMessageFromInjectedBundle):
* WebKitTestRunner/gtk/TestControllerGtk.cpp:
(WTR::TestController::abortModal):
* WebKitTestRunner/ios/TestControllerIOS.mm:
(WTR::TestController::abortModal):
* WebKitTestRunner/mac/TestControllerMac.mm:
(WTR::TestController::abortModal):
* WebKitTestRunner/win/TestControllerWin.cpp:
(WTR::TestController::abortModal):

LayoutTests:

* http/tests/security/showModalDialog-sync-cross-origin-page-load-expected.txt: Added.
* http/tests/security/showModalDialog-sync-cross-origin-page-load.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleBindingsTestRunneridl">trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleTestRunnercpp">trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleTestRunnerh">trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllerh">trunk/Tools/WebKitTestRunner/TestController.h</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestInvocationcpp">trunk/Tools/WebKitTestRunner/TestInvocation.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnergtkTestControllerGtkcpp">trunk/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunneriosTestControllerIOSmm">trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnermacTestControllerMacmm">trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerwinTestControllerWincpp">trunk/Tools/WebKitTestRunner/win/TestControllerWin.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestssecurityshowModalDialogsynccrossoriginpageloadexpectedtxt">trunk/LayoutTests/http/tests/security/showModalDialog-sync-cross-origin-page-load-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecurityshowModalDialogsynccrossoriginpageloadhtml">trunk/LayoutTests/http/tests/security/showModalDialog-sync-cross-origin-page-load.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (244897 => 244898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2019-05-03 01:05:32 UTC (rev 244897)
+++ trunk/LayoutTests/ChangeLog 2019-05-03 01:19:03 UTC (rev 244898)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2019-05-02  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><ins>+        Add test coverage for <rdar://problem/49731231>
+        https://bugs.webkit.org/show_bug.cgi?id=196730
+        <rdar://problem/49731231>
+
+        Reviewed by Ryosuke Niwa.
+
+        * http/tests/security/showModalDialog-sync-cross-origin-page-load-expected.txt: Added.
+        * http/tests/security/showModalDialog-sync-cross-origin-page-load.html: Added.
+
+2019-05-02  Chris Dumez  <cdumez@apple.com>
+
</ins><span class="cx">         Setting a frame's src to a javascript URL should not run it synchronously
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=197466
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecurityshowModalDialogsynccrossoriginpageloadexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/showModalDialog-sync-cross-origin-page-load-expected.txt (0 => 244898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/showModalDialog-sync-cross-origin-page-load-expected.txt                           (rev 0)
+++ trunk/LayoutTests/http/tests/security/showModalDialog-sync-cross-origin-page-load-expected.txt      2019-05-03 01:19:03 UTC (rev 244898)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+This test passes if it does not alert the fail.html's content when clicking the button.
+  
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestssecurityshowModalDialogsynccrossoriginpageloadhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/showModalDialog-sync-cross-origin-page-load.html (0 => 244898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/showModalDialog-sync-cross-origin-page-load.html                           (rev 0)
+++ trunk/LayoutTests/http/tests/security/showModalDialog-sync-cross-origin-page-load.html      2019-05-03 01:19:03 UTC (rev 244898)
</span><span class="lines">@@ -0,0 +1,76 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<b>This test passes if it does not alert the fail.html's content when clicking the button.</b><br>
+<input id="testButton" type="button" value="Click me"></input>
+<script>
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.setCanOpenWindows();
+    testRunner.waitUntilDone();
+}
+
+let counter = 0;
+function run() {
+  if (++counter == 2) {
+    parent_frame = frame.contentDocument.querySelector("iframe");
+    frame1 = parent_frame.appendChild(document.createElement("iframe"));
+    frame2 = parent_frame.appendChild(document.createElement("iframe"));
+    frame1.src = "javascript:top.runChild()";
+  }
+}
+
+let child_counter = 0;
+function runChild() {
+  if (++child_counter == 2) {
+    parent_frame.appendChild(frame2);
+
+    a = frame2.contentDocument.createElement("a");
+    a.href = cache_frame.src;
+    a.click();
+    
+    showModalDialog(URL.createObjectURL(new Blob([`
+      <script>
+        let intervalID = setInterval(() => {
+          try {
+            opener.frame.document.foo;
+          } catch (e) {
+            clearInterval(intervalID);
+
+            window.close();
+            if (window.testRunner)
+              testRunner.abortModal();
+          }
+        }, 100);
+      </scr` + "ipt>"], {type: "text/html"})));
+    frame2.src = "javascript:alert(document.documentElement.outerHTML)";
+  }
+}
+
+testButton.onclick = _ => {
+  frame = document.body.appendChild(document.createElement("iframe"));
+  frame.contentWindow.location = `javascript:'<b><p><iframe`
+      + ` src="javascript:top.run()"></iframe></b></p>'`;
+  setTimeout(() => {
+        setTimeout(() => {
+            if (window.testRunner)
+                testRunner.notifyDone();
+        }, 0);
+    }, 0);
+}
+
+cache_frame = document.body.appendChild(document.createElement("iframe"));
+cache_frame.src = "http://localhost:8000/security/resources/fail.html";
+cache_frame.style.display = "none";
+
+onload = function() {
+    if (!window.internals)
+       return;
+
+    internals.withUserGesture(() => {
+        testButton.click();
+    });
+}
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (244897 => 244898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2019-05-03 01:05:32 UTC (rev 244897)
+++ trunk/Tools/ChangeLog       2019-05-03 01:19:03 UTC (rev 244898)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2019-05-02  Chris Dumez  <cdumez@apple.com>
+
+        Add test coverage for <rdar://problem/49731231>
+        https://bugs.webkit.org/show_bug.cgi?id=196730
+        <rdar://problem/49731231>
+
+        Reviewed by Ryosuke Niwa.
+
+        Add support for testRunner.abortModal() in macOS's WebKitTestRunner in order
+        to match DumpRenderTree.
+
+        * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
+        * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+        (WTR::TestRunner::abortModal):
+        * WebKitTestRunner/InjectedBundle/TestRunner.h:
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::runModal):
+        * WebKitTestRunner/TestController.h:
+        * WebKitTestRunner/TestInvocation.cpp:
+        (WTR::TestInvocation::didReceiveSynchronousMessageFromInjectedBundle):
+        * WebKitTestRunner/gtk/TestControllerGtk.cpp:
+        (WTR::TestController::abortModal):
+        * WebKitTestRunner/ios/TestControllerIOS.mm:
+        (WTR::TestController::abortModal):
+        * WebKitTestRunner/mac/TestControllerMac.mm:
+        (WTR::TestController::abortModal):
+        * WebKitTestRunner/win/TestControllerWin.cpp:
+        (WTR::TestController::abortModal):
+
</ins><span class="cx"> 2019-05-02  Christopher Reid  <chris.reid@sony.com>
</span><span class="cx"> 
</span><span class="cx">         [CMake] Add support for LTO builds
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleBindingsTestRunneridl"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl (244897 => 244898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl      2019-05-03 01:05:32 UTC (rev 244897)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2019-05-03 01:19:03 UTC (rev 244898)
</span><span class="lines">@@ -352,6 +352,7 @@
</span><span class="cx"> 
</span><span class="cx">     // Modal alerts
</span><span class="cx">     void setShouldDismissJavaScriptAlertsAsynchronously(boolean value);
</span><ins>+    void abortModal();
</ins><span class="cx"> 
</span><span class="cx">     void setWebRTCMDNSICECandidatesEnabled(boolean value);
</span><span class="cx">     void setWebRTCUnifiedPlanEnabled(boolean value);
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleTestRunnercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (244897 => 244898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp       2019-05-03 01:05:32 UTC (rev 244897)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp  2019-05-03 01:19:03 UTC (rev 244898)
</span><span class="lines">@@ -2820,6 +2820,12 @@
</span><span class="cx">     WKBundlePostSynchronousMessage(InjectedBundle::singleton().bundle(), messageName.get(), messageBody.get(), nullptr);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void TestRunner::abortModal()
+{
+    WKRetainPtr<WKStringRef> messageName = adoptWK(WKStringCreateWithUTF8CString("AbortModal"));
+    WKBundlePostSynchronousMessage(InjectedBundle::singleton().bundle(), messageName.get(), nullptr, nullptr);
+}
+
</ins><span class="cx"> void TestRunner::dumpAdClickAttribution()
</span><span class="cx"> {
</span><span class="cx">     auto messageName = adoptWK(WKStringCreateWithUTF8CString("DumpAdClickAttribution"));
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleTestRunnerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h (244897 => 244898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2019-05-03 01:05:32 UTC (rev 244897)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h    2019-05-03 01:19:03 UTC (rev 244898)
</span><span class="lines">@@ -448,6 +448,7 @@
</span><span class="cx"> 
</span><span class="cx">     // Modal alerts
</span><span class="cx">     void setShouldDismissJavaScriptAlertsAsynchronously(bool);
</span><ins>+    void abortModal();
</ins><span class="cx"> 
</span><span class="cx">     void terminateNetworkProcess();
</span><span class="cx">     void terminateServiceWorkerProcess();
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (244897 => 244898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp  2019-05-03 01:05:32 UTC (rev 244897)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp     2019-05-03 01:19:03 UTC (rev 244898)
</span><span class="lines">@@ -229,9 +229,9 @@
</span><span class="cx"> void TestController::runModal(WKPageRef page, const void* clientInfo)
</span><span class="cx"> {
</span><span class="cx">     PlatformWebView* view = static_cast<PlatformWebView*>(const_cast<void*>(clientInfo));
</span><del>-    view->setWindowIsKey(false);
</del><ins>+    TestController::singleton().mainWebView()->setWindowIsKey(false);
</ins><span class="cx">     runModal(view);
</span><del>-    view->setWindowIsKey(true);
</del><ins>+    TestController::singleton().mainWebView()->setWindowIsKey(true);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static void closeOtherPage(WKPageRef page, const void* clientInfo)
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.h (244897 => 244898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.h    2019-05-03 01:05:32 UTC (rev 244897)
+++ trunk/Tools/WebKitTestRunner/TestController.h       2019-05-03 01:19:03 UTC (rev 244898)
</span><span class="lines">@@ -309,6 +309,7 @@
</span><span class="cx"> 
</span><span class="cx">     void setShouldDismissJavaScriptAlertsAsynchronously(bool);
</span><span class="cx">     void handleJavaScriptAlert(WKPageRunJavaScriptAlertResultListenerRef);
</span><ins>+    void abortModal();
</ins><span class="cx"> 
</span><span class="cx">     bool isDoingMediaCapture() const;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestInvocationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestInvocation.cpp (244897 => 244898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestInvocation.cpp  2019-05-03 01:05:32 UTC (rev 244897)
+++ trunk/Tools/WebKitTestRunner/TestInvocation.cpp     2019-05-03 01:19:03 UTC (rev 244898)
</span><span class="lines">@@ -1630,6 +1630,11 @@
</span><span class="cx">         return nullptr;
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    if (WKStringIsEqualToUTF8CString(messageName, "AbortModal")) {
+        TestController::singleton().abortModal();
+        return nullptr;
+    }
+
</ins><span class="cx">     if (WKStringIsEqualToUTF8CString(messageName, "DumpAdClickAttribution")) {
</span><span class="cx">         dumpAdClickAttribution();
</span><span class="cx">         return nullptr;
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnergtkTestControllerGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp (244897 => 244898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp   2019-05-03 01:05:32 UTC (rev 244897)
+++ trunk/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp      2019-05-03 01:19:03 UTC (rev 244898)
</span><span class="lines">@@ -124,6 +124,10 @@
</span><span class="cx">     // FIXME: Need to implement this to test showModalDialog.
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void TestController::abortModal()
+{
+}
+
</ins><span class="cx"> WKContextRef TestController::platformContext()
</span><span class="cx"> {
</span><span class="cx">     return m_context.get();
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunneriosTestControllerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm (244897 => 244898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm    2019-05-03 01:05:32 UTC (rev 244897)
+++ trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm       2019-05-03 01:19:03 UTC (rev 244898)
</span><span class="lines">@@ -231,6 +231,10 @@
</span><span class="cx"> //    [[UIApplication sharedApplication] runModalForWindow:window];
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void TestController::abortModal()
+{
+}
+
</ins><span class="cx"> const char* TestController::platformLibraryPathForTesting()
</span><span class="cx"> {
</span><span class="cx">     return [[@"~/Library/Application Support/WebKitTestRunner" stringByExpandingTildeInPath] UTF8String];
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnermacTestControllerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm (244897 => 244898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm    2019-05-03 01:05:32 UTC (rev 244897)
+++ trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm       2019-05-03 01:19:03 UTC (rev 244898)
</span><span class="lines">@@ -353,6 +353,11 @@
</span><span class="cx">     [NSApp runModalForWindow:window];
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void TestController::abortModal()
+{
+    [NSApp abortModal];
+}
+
</ins><span class="cx"> const char* TestController::platformLibraryPathForTesting()
</span><span class="cx"> {
</span><span class="cx">     return [[@"~/Library/Application Support/DumpRenderTree" stringByExpandingTildeInPath] UTF8String];
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerwinTestControllerWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/win/TestControllerWin.cpp (244897 => 244898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/win/TestControllerWin.cpp   2019-05-03 01:05:32 UTC (rev 244897)
+++ trunk/Tools/WebKitTestRunner/win/TestControllerWin.cpp      2019-05-03 01:19:03 UTC (rev 244898)
</span><span class="lines">@@ -197,6 +197,11 @@
</span><span class="cx">     notImplemented();
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void TestController::abortModal()
+{
+    notImplemented();
+}
+
</ins><span class="cx"> WKContextRef TestController::platformContext()
</span><span class="cx"> {
</span><span class="cx">     return m_context.get();
</span></span></pre>
</div>
</div>

</body>
</html>