<!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>[244446] 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/244446">244446</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2019-04-18 19:25:51 -0700 (Thu, 18 Apr 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/244434">r244434</a>.
https://bugs.webkit.org/show_bug.cgi?id=197089

caused 1 API test failure (Requested by zalan on #webkit).

Reverted changeset:

"Regression (<a href="http://trac.webkit.org/projects/webkit/changeset/244291">r244291</a>): Broken API Test
AutoLayoutRenderingProgressRelativeOrdering"
https://bugs.webkit.org/show_bug.cgi?id=196948
https://trac.webkit.org/changeset/244434</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewh">trunk/Source/WebCore/page/FrameView.h</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitUIProcessDrawingAreaProxyh">trunk/Source/WebKit/UIProcess/DrawingAreaProxy.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessDrawingAreaProxymessagesin">trunk/Source/WebKit/UIProcess/DrawingAreaProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKitUIProcessWebPageProxycpp">trunk/Source/WebKit/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKitUIProcessWebPageProxyh">trunk/Source/WebKit/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessWebPageProxymessagesin">trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKitUIProcessmacTiledCoreAnimationDrawingAreaProxyh">trunk/Source/WebKit/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessmacTiledCoreAnimationDrawingAreaProxymm">trunk/Source/WebKit/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessmacWebPageProxyMacmm">trunk/Source/WebKit/UIProcess/mac/WebPageProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebPageWebPagecpp">trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebPageWebPageh">trunk/Source/WebKit/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebPagemacTiledCoreAnimationDrawingAreah">trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebPagemacTiledCoreAnimationDrawingAreamm">trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitCocoaAutoLayoutIntegrationmm">trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/AutoLayoutIntegration.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (244445 => 244446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-04-19 00:12:34 UTC (rev 244445)
+++ trunk/Source/WebCore/ChangeLog      2019-04-19 02:25:51 UTC (rev 244446)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2019-04-18  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r244434.
+        https://bugs.webkit.org/show_bug.cgi?id=197089
+
+        caused 1 API test failure (Requested by zalan on #webkit).
+
+        Reverted changeset:
+
+        "Regression (r244291): Broken API Test
+        AutoLayoutRenderingProgressRelativeOrdering"
+        https://bugs.webkit.org/show_bug.cgi?id=196948
+        https://trac.webkit.org/changeset/244434
+
</ins><span class="cx"> 2019-04-18  Don Olmstead  <don.olmstead@sony.com>
</span><span class="cx"> 
</span><span class="cx">         [CMake] Make WebCore headers copies
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (244445 => 244446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp  2019-04-19 00:12:34 UTC (rev 244445)
+++ trunk/Source/WebCore/page/FrameView.cpp     2019-04-19 02:25:51 UTC (rev 244446)
</span><span class="lines">@@ -631,8 +631,6 @@
</span><span class="cx">         PageCache::singleton().markPagesForContentsSizeChanged(*page);
</span><span class="cx">     }
</span><span class="cx">     layoutContext().enableSetNeedsLayout();
</span><del>-    if (m_shouldAutoSize)
-        m_autoSizeContentSize = size; 
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void FrameView::adjustViewSize()
</span><span class="lines">@@ -3465,6 +3463,7 @@
</span><span class="cx">     resize(m_autoSizeConstraint.width(), m_autoSizeConstraint.height());
</span><span class="cx">     document->updateStyleIfNeeded();
</span><span class="cx">     document->updateLayoutIgnorePendingStylesheets();
</span><ins>+    m_autoSizeContentSize = contentsSize();
</ins><span class="cx"> 
</span><span class="cx">     auto finalWidth = std::max(m_autoSizeConstraint.width(), m_autoSizeContentSize.width());
</span><span class="cx">     auto finalHeight = m_autoSizeFixedMinimumHeight ? std::max(m_autoSizeFixedMinimumHeight, m_autoSizeContentSize.height()) : m_autoSizeContentSize.height();
</span><span class="lines">@@ -4471,7 +4470,6 @@
</span><span class="cx"> 
</span><span class="cx">     m_shouldAutoSize = enable;
</span><span class="cx">     m_autoSizeConstraint = viewSize;
</span><del>-    m_autoSizeContentSize = contentsSize();
</del><span class="cx">     m_didRunAutosize = false;
</span><span class="cx"> 
</span><span class="cx">     setNeedsLayoutAfterViewConfigurationChange();
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.h (244445 => 244446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.h    2019-04-19 00:12:34 UTC (rev 244445)
+++ trunk/Source/WebCore/page/FrameView.h       2019-04-19 02:25:51 UTC (rev 244446)
</span><span class="lines">@@ -401,7 +401,6 @@
</span><span class="cx">     bool isVisuallyNonEmpty() const { return m_isVisuallyNonEmpty; }
</span><span class="cx">     WEBCORE_EXPORT void enableAutoSizeMode(bool enable, const IntSize& minSize);
</span><span class="cx">     WEBCORE_EXPORT void setAutoSizeFixedMinimumHeight(int);
</span><del>-    bool isAutoSizeEnabled() const { return m_shouldAutoSize; }
</del><span class="cx">     IntSize autoSizingIntrinsicContentSize() const { return m_autoSizeContentSize; }
</span><span class="cx"> 
</span><span class="cx">     WEBCORE_EXPORT void forceLayout(bool allowSubtreeLayout = false);
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (244445 => 244446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2019-04-19 00:12:34 UTC (rev 244445)
+++ trunk/Source/WebKit/ChangeLog       2019-04-19 02:25:51 UTC (rev 244446)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2019-04-18  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r244434.
+        https://bugs.webkit.org/show_bug.cgi?id=197089
+
+        caused 1 API test failure (Requested by zalan on #webkit).
+
+        Reverted changeset:
+
+        "Regression (r244291): Broken API Test
+        AutoLayoutRenderingProgressRelativeOrdering"
+        https://bugs.webkit.org/show_bug.cgi?id=196948
+        https://trac.webkit.org/changeset/244434
+
</ins><span class="cx"> 2019-04-18  Wenson Hsieh  <wenson_hsieh@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Add new compatibility mode API on WKNavigation
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessDrawingAreaProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/DrawingAreaProxy.h (244445 => 244446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/DrawingAreaProxy.h 2019-04-19 00:12:34 UTC (rev 244445)
+++ trunk/Source/WebKit/UIProcess/DrawingAreaProxy.h    2019-04-19 02:25:51 UTC (rev 244446)
</span><span class="lines">@@ -143,6 +143,7 @@
</span><span class="cx">     virtual void updateAcceleratedCompositingMode(uint64_t /* backingStoreStateID */, const LayerTreeContext&) { }
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx">     virtual void didUpdateGeometry() { }
</span><ins>+    virtual void intrinsicContentSizeDidChange(const WebCore::IntSize&) { }
</ins><span class="cx"> 
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx">     RunLoop::Timer<DrawingAreaProxy> m_viewExposedRectChangedTimer;
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessDrawingAreaProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/DrawingAreaProxy.messages.in (244445 => 244446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/DrawingAreaProxy.messages.in       2019-04-19 00:12:34 UTC (rev 244445)
+++ trunk/Source/WebKit/UIProcess/DrawingAreaProxy.messages.in  2019-04-19 02:25:51 UTC (rev 244446)
</span><span class="lines">@@ -31,5 +31,6 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx">     // Used by TiledCoreAnimationDrawingAreaProxy.
</span><span class="cx">     DidUpdateGeometry()
</span><ins>+    IntrinsicContentSizeDidChange(WebCore::IntSize newIntrinsicContentSize)
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (244445 => 244446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp   2019-04-19 00:12:34 UTC (rev 244445)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp      2019-04-19 02:25:51 UTC (rev 244446)
</span><span class="lines">@@ -5464,13 +5464,6 @@
</span><span class="cx">     pageClient().didChangeContentSize(size);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WebPageProxy::didChangeIntrinsicContentSize(const IntSize& intrinsicContentSize)
-{
-#if USE(APPKIT)
-    pageClient().intrinsicContentSizeDidChange(intrinsicContentSize);
-#endif
-}
-
</del><span class="cx"> #if ENABLE(INPUT_TYPE_COLOR)
</span><span class="cx"> void WebPageProxy::showColorPicker(const WebCore::Color& initialColor, const IntRect& elementRect, Vector<WebCore::Color>&& suggestions)
</span><span class="cx"> {
</span><span class="lines">@@ -7603,7 +7596,7 @@
</span><span class="cx"> 
</span><span class="cx"> #if USE(APPKIT)
</span><span class="cx">     if (m_viewLayoutSize.width() <= 0)
</span><del>-        didChangeIntrinsicContentSize(IntSize(-1, -1));
</del><ins>+        intrinsicContentSizeDidChange(IntSize(-1, -1));
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (244445 => 244446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/WebPageProxy.h     2019-04-19 00:12:34 UTC (rev 244445)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h        2019-04-19 02:25:51 UTC (rev 244446)
</span><span class="lines">@@ -790,6 +790,7 @@
</span><span class="cx">     NSView *inspectorAttachmentView();
</span><span class="cx">     _WKRemoteObjectRegistry *remoteObjectRegistry();
</span><span class="cx"> 
</span><ins>+    void intrinsicContentSizeDidChange(const WebCore::IntSize& intrinsicContentSize);
</ins><span class="cx">     CGRect boundsOfLayerInLayerBackedWindowCoordinates(CALayer *) const;
</span><span class="cx"> #endif // PLATFORM(MAC)
</span><span class="cx"> 
</span><span class="lines">@@ -1714,7 +1715,6 @@
</span><span class="cx">     void didDestroyNotification(uint64_t notificationID);
</span><span class="cx"> 
</span><span class="cx">     void didChangeContentSize(const WebCore::IntSize&);
</span><del>-    void didChangeIntrinsicContentSize(const WebCore::IntSize&);
</del><span class="cx"> 
</span><span class="cx"> #if ENABLE(INPUT_TYPE_COLOR)
</span><span class="cx">     void showColorPicker(const WebCore::Color& initialColor, const WebCore::IntRect&, Vector<WebCore::Color>&&);
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in (244445 => 244446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in   2019-04-19 00:12:34 UTC (rev 244445)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in      2019-04-19 02:25:51 UTC (rev 244446)
</span><span class="lines">@@ -88,7 +88,6 @@
</span><span class="cx">     SetCanShortCircuitHorizontalWheelEvents(bool canShortCircuitHorizontalWheelEvents)
</span><span class="cx"> 
</span><span class="cx">     DidChangeContentSize(WebCore::IntSize newSize)
</span><del>-    DidChangeIntrinsicContentSize(WebCore::IntSize newIntrinsicContentSize)
</del><span class="cx"> 
</span><span class="cx"> #if ENABLE(INPUT_TYPE_COLOR)
</span><span class="cx">     ShowColorPicker(WebCore::Color initialColor, WebCore::IntRect elementRect, Vector<WebCore::Color> suggestions);
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessmacTiledCoreAnimationDrawingAreaProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h (244445 => 244446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h   2019-04-19 00:12:34 UTC (rev 244445)
+++ trunk/Source/WebKit/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h      2019-04-19 02:25:51 UTC (rev 244446)
</span><span class="lines">@@ -60,6 +60,7 @@
</span><span class="cx"> 
</span><span class="cx">     // Message handlers.
</span><span class="cx">     void didUpdateGeometry() override;
</span><ins>+    void intrinsicContentSizeDidChange(const WebCore::IntSize&) override;
</ins><span class="cx"> 
</span><span class="cx">     void sendUpdateGeometry();
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessmacTiledCoreAnimationDrawingAreaProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm (244445 => 244446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm  2019-04-19 00:12:34 UTC (rev 244445)
+++ trunk/Source/WebKit/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm     2019-04-19 02:25:51 UTC (rev 244446)
</span><span class="lines">@@ -125,6 +125,12 @@
</span><span class="cx">     process().connection()->waitForAndDispatchImmediately<Messages::WebPageProxy::DidUpdateActivityState>(m_webPageProxy.pageID(), activityStateUpdateTimeout, IPC::WaitForOption::InterruptWaitingIfSyncMessageArrives);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void TiledCoreAnimationDrawingAreaProxy::intrinsicContentSizeDidChange(const IntSize& newIntrinsicContentSize)
+{
+    if (m_webPageProxy.viewLayoutSize().width() > 0)
+        m_webPageProxy.intrinsicContentSizeDidChange(newIntrinsicContentSize);
+}
+
</ins><span class="cx"> void TiledCoreAnimationDrawingAreaProxy::willSendUpdateGeometry()
</span><span class="cx"> {
</span><span class="cx">     m_lastSentViewLayoutSize = m_webPageProxy.viewLayoutSize();
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessmacWebPageProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/mac/WebPageProxyMac.mm (244445 => 244446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/mac/WebPageProxyMac.mm     2019-04-19 00:12:34 UTC (rev 244445)
+++ trunk/Source/WebKit/UIProcess/mac/WebPageProxyMac.mm        2019-04-19 02:25:51 UTC (rev 244446)
</span><span class="lines">@@ -433,6 +433,11 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void WebPageProxy::intrinsicContentSizeDidChange(const IntSize& intrinsicContentSize)
+{
+    pageClient().intrinsicContentSizeDidChange(intrinsicContentSize);
+}
+
</ins><span class="cx"> void WebPageProxy::setRemoteLayerTreeRootNode(RemoteLayerTreeNode* rootNode)
</span><span class="cx"> {
</span><span class="cx">     pageClient().setRemoteLayerTreeRootNode(rootNode);
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (244445 => 244446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp       2019-04-19 00:12:34 UTC (rev 244445)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp  2019-04-19 02:25:51 UTC (rev 244446)
</span><span class="lines">@@ -6230,24 +6230,6 @@
</span><span class="cx">     m_userContentController->removeAllUserContent();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WebPage::updateIntrinsicContentSizeIfNeeded()
-{
-    if (!viewLayoutSize().width())
-        return;
-
-    ASSERT(mainFrameView());
-    if (!mainFrameView()->isAutoSizeEnabled())
-        return; 
-
-    ASSERT(!mainFrameView()->needsLayout());
-    auto contentSize = mainFrameView()->autoSizingIntrinsicContentSize();
-    if (m_lastSentIntrinsicContentSize == contentSize)
-        return;
-
-    m_lastSentIntrinsicContentSize = contentSize;
-    send(Messages::WebPageProxy::DidChangeIntrinsicContentSize(contentSize));
-}
-
</del><span class="cx"> void WebPage::dispatchDidReachLayoutMilestone(OptionSet<WebCore::LayoutMilestone> milestones)
</span><span class="cx"> {
</span><span class="cx">     RefPtr<API::Object> userData;
</span><span class="lines">@@ -6263,8 +6245,6 @@
</span><span class="cx">         if (drawingAreaRelatedMilestones && m_drawingArea->addMilestonesToDispatch(drawingAreaRelatedMilestones))
</span><span class="cx">             milestones.remove(drawingAreaRelatedMilestones);
</span><span class="cx">     }
</span><del>-    if (milestones.contains(DidFirstLayout))
-        updateIntrinsicContentSizeIfNeeded();
</del><span class="cx"> 
</span><span class="cx">     send(Messages::WebPageProxy::DidReachLayoutMilestone(milestones));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.h (244445 => 244446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2019-04-19 00:12:34 UTC (rev 244445)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.h    2019-04-19 02:25:51 UTC (rev 244446)
</span><span class="lines">@@ -1555,8 +1555,6 @@
</span><span class="cx"> 
</span><span class="cx">     bool shouldDispatchUpdateAfterFocusingElement(const WebCore::Element&) const;
</span><span class="cx"> 
</span><del>-    void updateIntrinsicContentSizeIfNeeded();
-
</del><span class="cx">     uint64_t m_pageID;
</span><span class="cx"> 
</span><span class="cx">     std::unique_ptr<WebCore::Page> m_page;
</span><span class="lines">@@ -1896,7 +1894,6 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx">     WeakPtr<RemoteObjectRegistry> m_remoteObjectRegistry;
</span><span class="cx"> #endif
</span><del>-    WebCore::IntSize m_lastSentIntrinsicContentSize;
</del><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebPagemacTiledCoreAnimationDrawingAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h (244445 => 244446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h       2019-04-19 00:12:34 UTC (rev 244445)
+++ trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h  2019-04-19 02:25:51 UTC (rev 244446)
</span><span class="lines">@@ -121,6 +121,7 @@
</span><span class="cx">     WebCore::TiledBacking* mainFrameTiledBacking() const;
</span><span class="cx">     void updateDebugInfoLayer(bool showLayer);
</span><span class="cx"> 
</span><ins>+    void updateIntrinsicContentSizeIfNeeded();
</ins><span class="cx">     void updateScrolledExposedRect();
</span><span class="cx">     void scaleViewToFitDocumentIfNeeded();
</span><span class="cx"> 
</span><span class="lines">@@ -149,6 +150,8 @@
</span><span class="cx">     WebCore::IntSize m_lastViewSizeForScaleToFit;
</span><span class="cx">     WebCore::IntSize m_lastDocumentSizeForScaleToFit;
</span><span class="cx"> 
</span><ins>+    WebCore::IntSize m_lastSentIntrinsicContentSize;
+
</ins><span class="cx">     double m_transientZoomScale { 1 };
</span><span class="cx">     WebCore::FloatPoint m_transientZoomOrigin;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebPagemacTiledCoreAnimationDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (244445 => 244446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm      2019-04-19 00:12:34 UTC (rev 244445)
+++ trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2019-04-19 02:25:51 UTC (rev 244446)
</span><span class="lines">@@ -278,6 +278,26 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void TiledCoreAnimationDrawingArea::updateIntrinsicContentSizeIfNeeded()
+{
+    if (!m_webPage.viewLayoutSize().width())
+        return;
+
+    FrameView* frameView = m_webPage.mainFrameView();
+    if (!frameView)
+        return;
+
+    if (frameView->needsLayout())
+        return;
+
+    IntSize contentSize = frameView->autoSizingIntrinsicContentSize();
+    if (m_lastSentIntrinsicContentSize == contentSize)
+        return;
+
+    m_lastSentIntrinsicContentSize = contentSize;
+    send(Messages::DrawingAreaProxy::IntrinsicContentSizeDidChange(contentSize));
+}
+
</ins><span class="cx"> void TiledCoreAnimationDrawingArea::setShouldScaleViewToFitDocument(bool shouldScaleView)
</span><span class="cx"> {
</span><span class="cx">     if (m_shouldScaleViewToFitDocument == shouldScaleView)
</span><span class="lines">@@ -442,6 +462,8 @@
</span><span class="cx">         m_webPage.updateRendering();
</span><span class="cx">         m_webPage.flushPendingEditorStateUpdate();
</span><span class="cx"> 
</span><ins>+        updateIntrinsicContentSizeIfNeeded();
+
</ins><span class="cx">         if (m_pendingRootLayer) {
</span><span class="cx">             setRootCompositingLayer(m_pendingRootLayer.get());
</span><span class="cx">             m_pendingRootLayer = nullptr;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (244445 => 244446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2019-04-19 00:12:34 UTC (rev 244445)
+++ trunk/Tools/ChangeLog       2019-04-19 02:25:51 UTC (rev 244446)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2019-04-18  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r244434.
+        https://bugs.webkit.org/show_bug.cgi?id=197089
+
+        caused 1 API test failure (Requested by zalan on #webkit).
+
+        Reverted changeset:
+
+        "Regression (r244291): Broken API Test
+        AutoLayoutRenderingProgressRelativeOrdering"
+        https://bugs.webkit.org/show_bug.cgi?id=196948
+        https://trac.webkit.org/changeset/244434
+
</ins><span class="cx"> 2019-04-18  Wenson Hsieh  <wenson_hsieh@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Add new compatibility mode API on WKNavigation
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitCocoaAutoLayoutIntegrationmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/AutoLayoutIntegration.mm (244445 => 244446)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/AutoLayoutIntegration.mm     2019-04-19 00:12:34 UTC (rev 244445)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/AutoLayoutIntegration.mm        2019-04-19 02:25:51 UTC (rev 244446)
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx">     [webView _setShouldExpandContentToViewHeightForAutoLayout:NO];
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-TEST(WebKit, AutoLayoutRenderingProgressRelativeOrdering)
</del><ins>+TEST(WebKit, DISABLED_AutoLayoutRenderingProgressRelativeOrdering)
</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">@@ -199,6 +199,7 @@
</span><span class="cx">     [webView setExpectedIntrinsicContentSize:NSMakeSize(100, 400)];
</span><span class="cx">     [webView loadHTMLString:@"<body style='margin: 0; height: 400px;'></body>" baseURL:nil];
</span><span class="cx">     TestWebKitAPI::Util::run(&didInvalidateIntrinsicContentSize);
</span><ins>+    EXPECT_FALSE(didFirstLayout);
</ins><span class="cx">     TestWebKitAPI::Util::run(&didFirstLayout);
</span><span class="cx">     TestWebKitAPI::Util::run(&didFinishNavigation);
</span><span class="cx">     [webView setNavigationDelegate:nil];
</span></span></pre>
</div>
</div>

</body>
</html>