<!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>[205363] 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/205363">205363</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2016-09-02 12:42:23 -0700 (Fri, 02 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/205329">r205329</a>): Two API tests time out on iOS Simulator
https://bugs.webkit.org/show_bug.cgi?id=161542
Reviewed by Brady Eidson.
* TestWebKitAPI/Tests/WebKit2Cocoa/AnimatedResize.mm:
(createAnimatedResizeWebView):
(createFirstVisuallyNonEmptyWatchingNavigationDelegate):
(TEST):
(animatedResizeWebView): Deleted.
The navigation delegate was being stored in a local and went out of scope
before the test was over. Keep it around, instead.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CocoaAnimatedResizemm">trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/AnimatedResize.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (205362 => 205363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-09-02 19:39:02 UTC (rev 205362)
+++ trunk/Tools/ChangeLog 2016-09-02 19:42:23 UTC (rev 205363)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-09-02 Tim Horton <timothy_horton@apple.com>
+
+ REGRESSION (r205329): Two API tests time out on iOS Simulator
+ https://bugs.webkit.org/show_bug.cgi?id=161542
+
+ Reviewed by Brady Eidson.
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/AnimatedResize.mm:
+ (createAnimatedResizeWebView):
+ (createFirstVisuallyNonEmptyWatchingNavigationDelegate):
+ (TEST):
+ (animatedResizeWebView): Deleted.
+ The navigation delegate was being stored in a local and went out of scope
+ before the test was over. Keep it around, instead.
+
</ins><span class="cx"> 2016-08-31 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Refactor MobileMiniBrowser into an application framework to allow external XCTesting
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaAnimatedResizemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/AnimatedResize.mm (205362 => 205363)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/AnimatedResize.mm 2016-09-02 19:39:02 UTC (rev 205362)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/AnimatedResize.mm 2016-09-02 19:42:23 UTC (rev 205363)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-static RetainPtr<WKWebView> animatedResizeWebView()
</del><ins>+static RetainPtr<WKWebView> createAnimatedResizeWebView()
</ins><span class="cx"> {
</span><span class="cx"> RetainPtr<_WKProcessPoolConfiguration> processPoolConfiguration = adoptNS([[_WKProcessPoolConfiguration alloc] init]);
</span><span class="cx"> [processPoolConfiguration setIgnoreSynchronousMessagingTimeoutsForTesting:YES];
</span><span class="lines">@@ -66,22 +66,27 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<WKWebView> webView = adoptNS([[AnimatedResizeWebView alloc] initWithFrame:CGRectMake(0, 0, 800, 600) configuration:webViewConfiguration.get()]);
</span><span class="cx">
</span><ins>+ NSURLRequest *request = [NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"blinking-div" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]];
+ [webView loadRequest:request];
+
+ return webView;
+}
+
+static RetainPtr<TestNavigationDelegate> createFirstVisuallyNonEmptyWatchingNavigationDelegate()
+{
</ins><span class="cx"> auto navigationDelegate = adoptNS([[TestNavigationDelegate alloc] init]);
</span><span class="cx"> [navigationDelegate setRenderingProgressDidChange:^(WKWebView *, _WKRenderingProgressEvents progressEvents) {
</span><span class="cx"> if (progressEvents & _WKRenderingProgressEventFirstVisuallyNonEmptyLayout)
</span><span class="cx"> didLayout = true;
</span><span class="cx"> }];
</span><del>- [webView setNavigationDelegate:navigationDelegate.get()];
-
- NSURLRequest *request = [NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"blinking-div" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]];
- [webView loadRequest:request];
-
- return webView;
</del><ins>+ return navigationDelegate;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(WebKit2, ResizeWithHiddenContentDoesNotHang)
</span><span class="cx"> {
</span><del>- auto webView = animatedResizeWebView();
</del><ins>+ auto webView = createAnimatedResizeWebView();
+ auto navigationDelegate = createFirstVisuallyNonEmptyWatchingNavigationDelegate();
+ [webView setNavigationDelegate:navigationDelegate.get()];
</ins><span class="cx"> RetainPtr<UIWindow> window = adoptNS([[UIWindow alloc] initWithFrame:CGRectMake(0, 0, 800, 600)]);
</span><span class="cx"> [window addSubview:webView.get()];
</span><span class="cx"> [window setHidden:NO];
</span><span class="lines">@@ -101,7 +106,9 @@
</span><span class="cx">
</span><span class="cx"> TEST(WebKit2, AnimatedResizeDoesNotHang)
</span><span class="cx"> {
</span><del>- auto webView = animatedResizeWebView();
</del><ins>+ auto webView = createAnimatedResizeWebView();
+ auto navigationDelegate = createFirstVisuallyNonEmptyWatchingNavigationDelegate();
+ [webView setNavigationDelegate:navigationDelegate.get()];
</ins><span class="cx"> RetainPtr<UIWindow> window = adoptNS([[UIWindow alloc] initWithFrame:CGRectMake(0, 0, 800, 600)]);
</span><span class="cx"> [window addSubview:webView.get()];
</span><span class="cx"> [window setHidden:NO];
</span></span></pre>
</div>
</div>
</body>
</html>