<!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>[260606] 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/260606">260606</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2020-04-23 16:45:15 -0700 (Thu, 23 Apr 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/260278">r260278</a>): TestWebKitAPI.Fullscreen.Delegate is timing out on macOS bots
https://bugs.webkit.org/show_bug.cgi?id=210676
<rdar://problem/61953702>

Reviewed by Daniel Bates.

A number of API tests modify the WKWebViewConfiguration after calling -[WKWebView initWithFrame:configuration:], which
could be a source of failures or flakiness. Update these tests to set those configuration values before passing the
configuration to WKWebView.

* TestWebKitAPI/Tests/WebKitCocoa/FullscreenAlert.mm:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKitCocoa/FullscreenDelegate.mm:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKitCocoa/FullscreenLayoutConstraints.mm:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKitCocoa/PictureInPictureDelegate.mm:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKitCocoa/TopContentInset.mm:
(TestWebKitAPI::TEST):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitCocoaFullscreenAlertmm">trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/FullscreenAlert.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitCocoaFullscreenDelegatemm">trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/FullscreenDelegate.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitCocoaFullscreenLayoutConstraintsmm">trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/FullscreenLayoutConstraints.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitCocoaPictureInPictureDelegatemm">trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/PictureInPictureDelegate.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitCocoaTopContentInsetmm">trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/TopContentInset.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (260605 => 260606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2020-04-23 23:43:50 UTC (rev 260605)
+++ trunk/Tools/ChangeLog       2020-04-23 23:45:15 UTC (rev 260606)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2020-04-23  Jer Noble  <jer.noble@apple.com>
+
+        REGRESSION (r260278): TestWebKitAPI.Fullscreen.Delegate is timing out on macOS bots
+        https://bugs.webkit.org/show_bug.cgi?id=210676
+        <rdar://problem/61953702>
+
+        Reviewed by Daniel Bates.
+
+        A number of API tests modify the WKWebViewConfiguration after calling -[WKWebView initWithFrame:configuration:], which
+        could be a source of failures or flakiness. Update these tests to set those configuration values before passing the
+        configuration to WKWebView.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/FullscreenAlert.mm:
+        (TestWebKitAPI::TEST):
+        * TestWebKitAPI/Tests/WebKitCocoa/FullscreenDelegate.mm:
+        (TestWebKitAPI::TEST):
+        * TestWebKitAPI/Tests/WebKitCocoa/FullscreenLayoutConstraints.mm:
+        (TestWebKitAPI::TEST):
+        * TestWebKitAPI/Tests/WebKitCocoa/PictureInPictureDelegate.mm:
+        (TestWebKitAPI::TEST):
+        * TestWebKitAPI/Tests/WebKitCocoa/TopContentInset.mm:
+        (TestWebKitAPI::TEST):
+
</ins><span class="cx"> 2020-04-23  Saam Barati  <sbarati@apple.com>
</span><span class="cx"> 
</span><span class="cx">         DumpRenderTree should have the JIT entitlement on Mac
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitCocoaFullscreenAlertmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/FullscreenAlert.mm (260605 => 260606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/FullscreenAlert.mm   2020-04-23 23:43:50 UTC (rev 260605)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/FullscreenAlert.mm      2020-04-23 23:45:15 UTC (rev 260606)
</span><span class="lines">@@ -41,8 +41,8 @@
</span><span class="cx"> TEST(Fullscreen, Alert)
</span><span class="cx"> {
</span><span class="cx">     auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
</span><ins>+    [configuration preferences]._fullScreenEnabled = YES;
</ins><span class="cx">     auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100) configuration:configuration.get()]);
</span><del>-    [configuration preferences]._fullScreenEnabled = YES;
</del><span class="cx"> 
</span><span class="cx">     auto checkFullscreen = [&] {
</span><span class="cx">         isInFullscreen = [webView _isInFullscreen];
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitCocoaFullscreenDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/FullscreenDelegate.mm (260605 => 260606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/FullscreenDelegate.mm        2020-04-23 23:43:50 UTC (rev 260605)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/FullscreenDelegate.mm   2020-04-23 23:45:15 UTC (rev 260606)
</span><span class="lines">@@ -85,8 +85,8 @@
</span><span class="cx"> TEST(Fullscreen, Delegate)
</span><span class="cx"> {
</span><span class="cx">     RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
</span><ins>+    [configuration preferences]._fullScreenEnabled = YES;
</ins><span class="cx">     RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100) configuration:configuration.get()]);
</span><del>-    [configuration preferences]._fullScreenEnabled = YES;
</del><span class="cx">     RetainPtr<FullscreenDelegateMessageHandler> handler = adoptNS([[FullscreenDelegateMessageHandler alloc] init]);
</span><span class="cx">     [[configuration userContentController] addScriptMessageHandler:handler.get() name:@"fullscreenChangeHandler"];
</span><span class="cx">     [webView _setFullscreenDelegate:handler.get()];
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitCocoaFullscreenLayoutConstraintsmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/FullscreenLayoutConstraints.mm (260605 => 260606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/FullscreenLayoutConstraints.mm       2020-04-23 23:43:50 UTC (rev 260605)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/FullscreenLayoutConstraints.mm  2020-04-23 23:45:15 UTC (rev 260606)
</span><span class="lines">@@ -55,8 +55,8 @@
</span><span class="cx"> TEST(Fullscreen, LayoutConstraints)
</span><span class="cx"> {
</span><span class="cx">     RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
</span><ins>+    [configuration preferences]._fullScreenEnabled = YES;
</ins><span class="cx">     RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100) configuration:configuration.get()]);
</span><del>-    [configuration preferences]._fullScreenEnabled = YES;
</del><span class="cx">     RetainPtr<FullscreenStateChangeMessageHandler> handler = adoptNS([[FullscreenStateChangeMessageHandler alloc] init]);
</span><span class="cx">     [[configuration userContentController] addScriptMessageHandler:handler.get() name:@"fullscreenStateChangeHandler"];
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitCocoaPictureInPictureDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/PictureInPictureDelegate.mm (260605 => 260606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/PictureInPictureDelegate.mm  2020-04-23 23:43:50 UTC (rev 260605)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/PictureInPictureDelegate.mm     2020-04-23 23:45:15 UTC (rev 260606)
</span><span class="lines">@@ -112,11 +112,12 @@
</span><span class="cx"> TEST(PictureInPicture, WKUIDelegate)
</span><span class="cx"> {
</span><span class="cx">     RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
</span><del>-    RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 640, 480) configuration:configuration.get()]);
</del><span class="cx">     [configuration preferences]._fullScreenEnabled = YES;
</span><span class="cx">     [configuration preferences]._allowsPictureInPictureMediaPlayback = YES;
</span><span class="cx">     RetainPtr<PictureInPictureUIDelegate> handler = adoptNS([[PictureInPictureUIDelegate alloc] init]);
</span><span class="cx">     [[configuration userContentController] addScriptMessageHandler:handler.get() name:@"pictureInPictureChangeHandler"];
</span><ins>+    RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 640, 480) configuration:configuration.get()]);
+
</ins><span class="cx">     [webView setUIDelegate:handler.get()];
</span><span class="cx"> 
</span><span class="cx"> #if HAVE(TOUCH_BAR)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitCocoaTopContentInsetmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/TopContentInset.mm (260605 => 260606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/TopContentInset.mm   2020-04-23 23:43:50 UTC (rev 260605)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/TopContentInset.mm      2020-04-23 23:45:15 UTC (rev 260606)
</span><span class="lines">@@ -56,12 +56,12 @@
</span><span class="cx"> TEST(TopContentInset, Fullscreen)
</span><span class="cx"> {
</span><span class="cx">     RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
</span><ins>+    [configuration preferences]._fullScreenEnabled = YES;
+    RetainPtr<FullscreenChangeMessageHandler> handler = adoptNS([[FullscreenChangeMessageHandler alloc] init]);
+    [[configuration userContentController] addScriptMessageHandler:handler.get() name:@"fullscreenChangeHandler"];
</ins><span class="cx">     RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100) configuration:configuration.get()]);
</span><span class="cx">     [webView _setTopContentInset:10];
</span><span class="cx">     [webView _setAutomaticallyAdjustsContentInsets:NO];
</span><del>-    [configuration preferences]._fullScreenEnabled = YES;
-    RetainPtr<FullscreenChangeMessageHandler> handler = adoptNS([[FullscreenChangeMessageHandler alloc] init]);
-    [[configuration userContentController] addScriptMessageHandler:handler.get() name:@"fullscreenChangeHandler"];
</del><span class="cx"> 
</span><span class="cx">     RetainPtr<NSWindow> window = adoptNS([[NSWindow alloc] initWithContentRect:[webView frame] styleMask:NSWindowStyleMaskBorderless backing:NSBackingStoreBuffered defer:NO]);
</span><span class="cx">     [[window contentView] addSubview:webView.get()];
</span></span></pre>
</div>
</div>

</body>
</html>