<!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>[207600] branches/safari-602-branch</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/207600">207600</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-10-20 02:59:35 -0700 (Thu, 20 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/206247">r206247</a>. rdar://problem/28216256</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchSourceWebKit2ChangeLog">branches/safari-602-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreah">branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h</a></li>
<li><a href="#branchessafari602branchSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreah">branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h</a></li>
<li><a href="#branchessafari602branchSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm">branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm</a></li>
<li><a href="#branchessafari602branchToolsChangeLog">branches/safari-602-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari602branchToolsTestWebKitAPITestsWebKit2CocoaAutoLayoutIntegrationmm">branches/safari-602-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/AutoLayoutIntegration.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/ChangeLog (207599 => 207600)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-10-20 09:59:31 UTC (rev 207599)
+++ branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-10-20 09:59:35 UTC (rev 207600)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2016-10-20 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r206247. rdar://problem/28216256
+
+ 2016-09-21 Dan Bernstein <mitz@apple.com>
+
+ [macOS] Upon layout, _webView:renderingProgressDidChange: fires before the intrinsic content size is updated
+ https://bugs.webkit.org/show_bug.cgi?id=162359
+ <rdar://problem/27776454>
+
+ Reviewed by Tim Horton.
+
+ Test: added to TestWebKitAPI/Tests/WebKit2Cocoa/AutoLayoutIntegration.mm
+
+ * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h: Fixed a bug where
+ m_pendingNewlyReachedLayoutMilestones was never initialized.
+
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h: Added
+ m_pendingNewlyReachedLayoutMilestones member variable to this derived class as well.
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+ (WebKit::TiledCoreAnimationDrawingArea::flushLayers): If we have pending milestones, notify
+ the WebPageProxy now, after any content size changes have been sent.
+ (WebKit::TiledCoreAnimationDrawingArea::dispatchDidReachLayoutMilestone): New override that
+ accumulates the milestones into m_pendingNewlyReachedLayoutMilestones and returns true,
+ so that the caller won’t notify the WebPageProxy immediately.
+
+2016-10-20 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r206132. rdar://problem/28634856
</span><span class="cx">
</span><span class="cx"> 2016-09-19 Anders Carlsson <andersca@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreah"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h (207599 => 207600)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h 2016-10-20 09:59:31 UTC (rev 207599)
+++ branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h 2016-10-20 09:59:35 UTC (rev 207600)
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> uint64_t m_currentTransactionID;
</span><span class="cx"> Vector<RemoteLayerTreeTransaction::TransactionCallbackID> m_pendingCallbackIDs;
</span><span class="cx">
</span><del>- WebCore::LayoutMilestones m_pendingNewlyReachedLayoutMilestones;
</del><ins>+ WebCore::LayoutMilestones m_pendingNewlyReachedLayoutMilestones { 0 };
</ins><span class="cx">
</span><span class="cx"> WebCore::GraphicsLayer* m_contentLayer;
</span><span class="cx"> WebCore::GraphicsLayer* m_viewOverlayRootLayer;
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreah"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h (207599 => 207600)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h 2016-10-20 09:59:31 UTC (rev 207599)
+++ branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h 2016-10-20 09:59:35 UTC (rev 207600)
</span><span class="lines">@@ -86,6 +86,8 @@
</span><span class="cx">
</span><span class="cx"> void attachViewOverlayGraphicsLayer(WebCore::Frame*, WebCore::GraphicsLayer*) override;
</span><span class="cx">
</span><ins>+ bool dispatchDidReachLayoutMilestone(WebCore::LayoutMilestones) override;
+
</ins><span class="cx"> // WebCore::LayerFlushSchedulerClient
</span><span class="cx"> bool flushLayers() override;
</span><span class="cx">
</span><span class="lines">@@ -154,6 +156,8 @@
</span><span class="cx"> bool m_isScalingViewToFitDocument { false };
</span><span class="cx"> WebCore::IntSize m_lastViewSizeForScaleToFit;
</span><span class="cx"> WebCore::IntSize m_lastDocumentSizeForScaleToFit;
</span><ins>+
+ WebCore::LayoutMilestones m_pendingNewlyReachedLayoutMilestones { 0 };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (207599 => 207600)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2016-10-20 09:59:31 UTC (rev 207599)
+++ branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2016-10-20 09:59:35 UTC (rev 207600)
</span><span class="lines">@@ -439,6 +439,10 @@
</span><span class="cx"> if (m_transientZoomScale != 1)
</span><span class="cx"> applyTransientZoomToLayers(m_transientZoomScale, m_transientZoomOrigin);
</span><span class="cx">
</span><ins>+ if (m_pendingNewlyReachedLayoutMilestones)
+ m_webPage.send(Messages::WebPageProxy::DidReachLayoutMilestone(m_pendingNewlyReachedLayoutMilestones));
+ m_pendingNewlyReachedLayoutMilestones = 0;
+
</ins><span class="cx"> return returnValue;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -864,6 +868,12 @@
</span><span class="cx"> m_layerHostingContext->setFencePort(fencePort.sendRight());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool TiledCoreAnimationDrawingArea::dispatchDidReachLayoutMilestone(WebCore::LayoutMilestones layoutMilestones)
+{
+ m_pendingNewlyReachedLayoutMilestones |= layoutMilestones;
+ return true;
+}
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // !PLATFORM(IOS)
</span></span></pre></div>
<a id="branchessafari602branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Tools/ChangeLog (207599 => 207600)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Tools/ChangeLog 2016-10-20 09:59:31 UTC (rev 207599)
+++ branches/safari-602-branch/Tools/ChangeLog 2016-10-20 09:59:35 UTC (rev 207600)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2016-10-20 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r206247. rdar://problem/28216256
+
+ 2016-09-21 Dan Bernstein <mitz@apple.com>
+
+ [macOS] Upon layout, _webView:renderingProgressDidChange: fires before the intrinsic content size is updated
+ https://bugs.webkit.org/show_bug.cgi?id=162359
+ <rdar://problem/27776454>
+
+ Reviewed by Tim Horton.
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/AutoLayoutIntegration.mm:
+ (TEST):
+
+2016-10-20 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r205326. rdar://problem/28476952
</span><span class="cx">
</span><span class="cx"> 2016-09-01 Ricky Mondello <rmondello@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchToolsTestWebKitAPITestsWebKit2CocoaAutoLayoutIntegrationmm"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/AutoLayoutIntegration.mm (207599 => 207600)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/AutoLayoutIntegration.mm 2016-10-20 09:59:31 UTC (rev 207599)
+++ branches/safari-602-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/AutoLayoutIntegration.mm 2016-10-20 09:59:35 UTC (rev 207600)
</span><span class="lines">@@ -48,12 +48,11 @@
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface AutoLayoutWKWebView : WKWebView
</span><ins>+@property (nonatomic) BOOL expectingIntrinsicContentSizeChange;
+@property (nonatomic) NSSize expectedIntrinsicContentSize;
</ins><span class="cx"> @end
</span><span class="cx">
</span><del>-@implementation AutoLayoutWKWebView {
- BOOL _expectingIntrinsicContentSizeChange;
- NSSize _expectedIntrinsicContentSize;
-}
</del><ins>+@implementation AutoLayoutWKWebView
</ins><span class="cx">
</span><span class="cx"> - (void)load:(NSString *)HTMLString withWidth:(CGFloat)width expectingContentSize:(NSSize)size
</span><span class="cx"> {
</span><span class="lines">@@ -163,6 +162,33 @@
</span><span class="cx"> }];
</span><span class="cx"> TestWebKitAPI::Util::run(&didEvaluateJavaScript);
</span><span class="cx"> didEvaluateJavaScript = false;
</span><ins>+ [webView _setShouldExpandContentToViewHeightForAutoLayout:NO];
+
+ auto navigationDelegate = adoptNS([[TestNavigationDelegate alloc] init]);
+
+ __block bool didFinishNavigation = false;
+ [navigationDelegate setDidFinishNavigation:^(WKWebView *, WKNavigation *) {
+ didFinishNavigation = true;
+ }];
+ __block bool didFirstLayout = false;
+ [navigationDelegate setRenderingProgressDidChange:^(WKWebView *, _WKRenderingProgressEvents progressEvents) {
+ if (progressEvents & _WKRenderingProgressEventFirstLayout) {
+ didFirstLayout = true;
+ EXPECT_TRUE(didInvalidateIntrinsicContentSize);
+ }
+ }];
+ [webView setNavigationDelegate:navigationDelegate.get()];
+
+ [webView _setMinimumLayoutWidth:100];
+ didInvalidateIntrinsicContentSize = false;
+ [webView setExpectingIntrinsicContentSizeChange:YES];
+ [webView setExpectedIntrinsicContentSize:NSMakeSize(100, 400)];
+ [webView loadHTMLString:@"<body style='margin: 0; height: 400px;'></body>" baseURL:nil];
+ TestWebKitAPI::Util::run(&didInvalidateIntrinsicContentSize);
+ EXPECT_FALSE(didFirstLayout);
+ TestWebKitAPI::Util::run(&didFirstLayout);
+ TestWebKitAPI::Util::run(&didFinishNavigation);
+ [webView setNavigationDelegate:nil];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>