<!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>[206572] 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/206572">206572</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2016-09-28 18:14:38 -0700 (Wed, 28 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>API test WebKit2.AutoLayoutIntegration is a flaky timeout
https://bugs.webkit.org/show_bug.cgi?id=160284
Reviewed by Dan Bernstein.
* TestWebKitAPI/Tests/WebKit2Cocoa/AutoLayoutIntegration.mm:
(-[AutoLayoutWKWebView load:withWidth:expectingContentSize:resettingWidth:]):
(-[AutoLayoutWKWebView beginLayoutAtMinimumWidth:andExpectContentSizeChange:]):
(-[AutoLayoutWKWebView waitForContentSizeChangeResettingWidth:]):
(-[AutoLayoutWKWebView layoutAtMinimumWidth:andExpectContentSizeChange:resettingWidth:]):
(-[AutoLayoutWKWebView invalidateIntrinsicContentSize]):
(TEST):
Make the autolayout tests a bit more flexible regarding the ordering of
invalidateIntrinsicContentSize, to avoid a race between the load
completing and the invalidation.
Also, move the newly added test to use its own WKWebView, since once in a
while we get a first layout notification from the previous page, causing the test to fail.
Un-disable the tests, which now run without any flakes for me with quite a few iterations.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CocoaAutoLayoutIntegrationmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/AutoLayoutIntegration.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (206571 => 206572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-09-29 00:58:02 UTC (rev 206571)
+++ trunk/Tools/ChangeLog 2016-09-29 01:14:38 UTC (rev 206572)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-09-28 Tim Horton <timothy_horton@apple.com>
+
+ API test WebKit2.AutoLayoutIntegration is a flaky timeout
+ https://bugs.webkit.org/show_bug.cgi?id=160284
+
+ Reviewed by Dan Bernstein.
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/AutoLayoutIntegration.mm:
+ (-[AutoLayoutWKWebView load:withWidth:expectingContentSize:resettingWidth:]):
+ (-[AutoLayoutWKWebView beginLayoutAtMinimumWidth:andExpectContentSizeChange:]):
+ (-[AutoLayoutWKWebView waitForContentSizeChangeResettingWidth:]):
+ (-[AutoLayoutWKWebView layoutAtMinimumWidth:andExpectContentSizeChange:resettingWidth:]):
+ (-[AutoLayoutWKWebView invalidateIntrinsicContentSize]):
+ (TEST):
+ Make the autolayout tests a bit more flexible regarding the ordering of
+ invalidateIntrinsicContentSize, to avoid a race between the load
+ completing and the invalidation.
+
+ Also, move the newly added test to use its own WKWebView, since once in a
+ while we get a first layout notification from the previous page, causing the test to fail.
+
+ Un-disable the tests, which now run without any flakes for me with quite a few iterations.
+
</ins><span class="cx"> 2016-09-28 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> URLParser should properly handle unexpected periods and overflows in IPv4 addresses
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaAutoLayoutIntegrationmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/AutoLayoutIntegration.mm (206571 => 206572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/AutoLayoutIntegration.mm 2016-09-29 00:58:02 UTC (rev 206571)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/AutoLayoutIntegration.mm 2016-09-29 01:14:38 UTC (rev 206572)
</span><span class="lines">@@ -70,12 +70,13 @@
</span><span class="cx"> "</style>";
</span><span class="cx">
</span><span class="cx"> [self loadHTMLString:[baseHTML stringByAppendingString:HTMLString] baseURL:nil];
</span><ins>+ [self beginLayoutAtMinimumWidth:width andExpectContentSizeChange:size];
</ins><span class="cx"> [self _test_waitForDidFinishNavigation];
</span><span class="cx">
</span><del>- [self layoutAtMinimumWidth:width andExpectContentSizeChange:size resettingWidth:resetAfter];
</del><ins>+ [self waitForContentSizeChangeResettingWidth:resetAfter];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)layoutAtMinimumWidth:(CGFloat)width andExpectContentSizeChange:(NSSize)size resettingWidth:(BOOL)resetAfter
</del><ins>+- (void)beginLayoutAtMinimumWidth:(CGFloat)width andExpectContentSizeChange:(NSSize)size
</ins><span class="cx"> {
</span><span class="cx"> [self _setMinimumLayoutWidth:width];
</span><span class="cx">
</span><span class="lines">@@ -85,12 +86,26 @@
</span><span class="cx"> _expectingIntrinsicContentSizeChange = YES;
</span><span class="cx"> _expectedIntrinsicContentSize = size;
</span><span class="cx"> didInvalidateIntrinsicContentSize = false;
</span><ins>+}
+
+- (void)waitForContentSizeChangeResettingWidth:(BOOL)resetAfter
+{
</ins><span class="cx"> TestWebKitAPI::Util::run(&didInvalidateIntrinsicContentSize);
</span><span class="cx">
</span><ins>+ NSSize intrinsicContentSize = self.intrinsicContentSize;
+ EXPECT_EQ(_expectedIntrinsicContentSize.width, intrinsicContentSize.width);
+ EXPECT_EQ(_expectedIntrinsicContentSize.height, intrinsicContentSize.height);
+
</ins><span class="cx"> if (resetAfter)
</span><span class="cx"> [self _setMinimumLayoutWidth:0];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)layoutAtMinimumWidth:(CGFloat)width andExpectContentSizeChange:(NSSize)size resettingWidth:(BOOL)resetAfter
+{
+ [self beginLayoutAtMinimumWidth:width andExpectContentSizeChange:size];
+ [self waitForContentSizeChangeResettingWidth:resetAfter];
+}
+
</ins><span class="cx"> - (void)invalidateIntrinsicContentSize
</span><span class="cx"> {
</span><span class="cx"> if (!_expectingIntrinsicContentSizeChange)
</span><span class="lines">@@ -97,17 +112,12 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> _expectingIntrinsicContentSizeChange = NO;
</span><del>-
- NSSize intrinsicContentSize = self.intrinsicContentSize;
- EXPECT_EQ(_expectedIntrinsicContentSize.width, intrinsicContentSize.width);
- EXPECT_EQ(_expectedIntrinsicContentSize.height, intrinsicContentSize.height);
-
</del><span class="cx"> didInvalidateIntrinsicContentSize = true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-TEST(WebKit2, DISABLED_AutoLayoutIntegration)
</del><ins>+TEST(WebKit2, AutoLayoutIntegration)
</ins><span class="cx"> {
</span><span class="cx"> RetainPtr<AutoLayoutWKWebView> webView = adoptNS([[AutoLayoutWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 1000, 1000)]);
</span><span class="cx">
</span><span class="lines">@@ -156,7 +166,12 @@
</span><span class="cx"> TestWebKitAPI::Util::run(&didEvaluateJavaScript);
</span><span class="cx"> didEvaluateJavaScript = false;
</span><span class="cx"> [webView _setShouldExpandContentToViewHeightForAutoLayout:NO];
</span><ins>+}
</ins><span class="cx">
</span><ins>+TEST(WebKit2, AutoLayoutRenderingProgressRelativeOrdering)
+{
+ RetainPtr<AutoLayoutWKWebView> webView = adoptNS([[AutoLayoutWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 1000, 1000)]);
+
</ins><span class="cx"> auto navigationDelegate = adoptNS([[TestNavigationDelegate alloc] init]);
</span><span class="cx">
</span><span class="cx"> __block bool didFinishNavigation = false;
</span></span></pre>
</div>
</div>
</body>
</html>