<!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>[212101] branches/safari-603-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/212101">212101</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-02-10 01:11:36 -0800 (Fri, 10 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Roll out <a href="http://trac.webkit.org/projects/webkit/changeset/209845">r209845</a>. rdar://problem/30114564</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsChangeLog">branches/safari-603-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari603branchLayoutTestsplatformiossimulatorwk2TestExpectations">branches/safari-603-branch/LayoutTests/platform/ios-simulator-wk2/TestExpectations</a></li>
<li><a href="#branchessafari603branchSourceWebKit2ChangeLog">branches/safari-603-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebKit2SharedVisibleContentRectUpdateInfocpp">branches/safari-603-branch/Source/WebKit2/Shared/VisibleContentRectUpdateInfo.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebKit2SharedVisibleContentRectUpdateInfoh">branches/safari-603-branch/Source/WebKit2/Shared/VisibleContentRectUpdateInfo.h</a></li>
<li><a href="#branchessafari603branchSourceWebKit2UIProcessAPICocoaWKWebViewmm">branches/safari-603-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#branchessafari603branchSourceWebKit2UIProcessDrawingAreaProxycpp">branches/safari-603-branch/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebKit2UIProcessDrawingAreaProxyh">branches/safari-603-branch/Source/WebKit2/UIProcess/DrawingAreaProxy.h</a></li>
<li><a href="#branchessafari603branchSourceWebKit2UIProcessWebPageProxycpp">branches/safari-603-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebKit2UIProcessWebPageProxyh">branches/safari-603-branch/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#branchessafari603branchSourceWebKit2UIProcessiosWKContentViewh">branches/safari-603-branch/Source/WebKit2/UIProcess/ios/WKContentView.h</a></li>
<li><a href="#branchessafari603branchSourceWebKit2UIProcessiosWKContentViewmm">branches/safari-603-branch/Source/WebKit2/UIProcess/ios/WKContentView.mm</a></li>
<li><a href="#branchessafari603branchSourceWebKit2WebProcessWebPageiosWebPageIOSmm">branches/safari-603-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/ChangeLog (212100 => 212101)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/ChangeLog 2017-02-10 09:04:32 UTC (rev 212100)
+++ branches/safari-603-branch/LayoutTests/ChangeLog 2017-02-10 09:11:36 UTC (rev 212101)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2017-02-09 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Roll out r209845. rdar://problem/30114564
+
+ 2016-12-14 Simon Fraser <simon.fraser@apple.com>
+
+ Fix cause of viewport-related flakiness in iOS tests
+ https://bugs.webkit.org/show_bug.cgi?id=165878
+
+ Reviewed by Tim Horton.
+
+ Try un-flaking some viewport tests.
+
+ * platform/ios-simulator-wk2/TestExpectations:
+
+2017-02-09 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r212029. rdar://problem/30376972
</span><span class="cx">
</span><span class="cx"> 2017-02-09 Chris Dumez <cdumez@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsplatformiossimulatorwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/platform/ios-simulator-wk2/TestExpectations (212100 => 212101)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/platform/ios-simulator-wk2/TestExpectations 2017-02-10 09:04:32 UTC (rev 212100)
+++ branches/safari-603-branch/LayoutTests/platform/ios-simulator-wk2/TestExpectations 2017-02-10 09:11:36 UTC (rev 212101)
</span><span class="lines">@@ -1812,6 +1812,10 @@
</span><span class="cx"> # Forcing always allow user scalable is not supported on certain OS version.
</span><span class="cx"> webkit.org/b/155056 fast/viewport/ios/force-always-user-scalable.html [ Skip ]
</span><span class="cx">
</span><ins>+webkit.org/b/153110 fast/viewport/ios/width-is-device-width-overflowing.html [ Pass Failure ]
+webkit.org/b/153110 fast/viewport/ios/width-is-device-width-overflowing-body-overflow-hidden.html [ Pass Failure ]
+webkit.org/b/153110 fast/viewport/ios/width-is-device-width-overflowing-body-overflow-hidden-tall.html [ Pass Failure ]
+
</ins><span class="cx"> webkit.org/b/155501 animations/3d/transform-origin-vs-functions.html [ Pass Failure ]
</span><span class="cx">
</span><span class="cx"> webkit.org/b/155495 compositing/visible-rect/animated-from-none.html [ Pass Failure ]
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (212100 => 212101)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-02-10 09:04:32 UTC (rev 212100)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-02-10 09:11:36 UTC (rev 212101)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2017-02-09 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Roll out r209845. rdar://problem/30114564
+
+ 2016-12-14 Simon Fraser <simon.fraser@apple.com>
+
+ Fix cause of viewport-related flakiness in iOS tests
+ https://bugs.webkit.org/show_bug.cgi?id=165878
+
+ Reviewed by Tim Horton.
+
+ Try un-flaking some viewport tests.
+
+ * platform/ios-simulator-wk2/TestExpectations:
+
+2017-02-09 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r211915. rdar://problem/27607520
</span><span class="cx">
</span><span class="cx"> 2017-02-08 Andy Estes <aestes@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2SharedVisibleContentRectUpdateInfocpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/Shared/VisibleContentRectUpdateInfo.cpp (212100 => 212101)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/Shared/VisibleContentRectUpdateInfo.cpp 2017-02-10 09:04:32 UTC (rev 212100)
+++ branches/safari-603-branch/Source/WebKit2/Shared/VisibleContentRectUpdateInfo.cpp 2017-02-10 09:11:36 UTC (rev 212101)
</span><span class="lines">@@ -47,7 +47,6 @@
</span><span class="cx"> encoder << m_verticalVelocity;
</span><span class="cx"> encoder << m_scaleChangeRate;
</span><span class="cx"> encoder << m_inStableState;
</span><del>- encoder << m_isFirstUpdateForNewViewSize;
</del><span class="cx"> encoder << m_isChangingObscuredInsetsInteractively;
</span><span class="cx"> encoder << m_allowShrinkToFit;
</span><span class="cx"> encoder << m_enclosedInScrollableAncestorView;
</span><span class="lines">@@ -79,8 +78,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(result.m_inStableState))
</span><span class="cx"> return false;
</span><del>- if (!decoder.decode(result.m_isFirstUpdateForNewViewSize))
- return false;
</del><span class="cx"> if (!decoder.decode(result.m_isChangingObscuredInsetsInteractively))
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(result.m_allowShrinkToFit))
</span><span class="lines">@@ -115,7 +112,6 @@
</span><span class="cx">
</span><span class="cx"> ts.dumpProperty("scale", info.scale());
</span><span class="cx"> ts.dumpProperty("inStableState", info.inStableState());
</span><del>- ts.dumpProperty("isFirstUpdateForNewViewSize", info.isFirstUpdateForNewViewSize());
</del><span class="cx"> if (info.isChangingObscuredInsetsInteractively())
</span><span class="cx"> ts.dumpProperty("isChangingObscuredInsetsInteractively", info.isChangingObscuredInsetsInteractively());
</span><span class="cx"> if (info.enclosedInScrollableAncestorView())
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2SharedVisibleContentRectUpdateInfoh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/Shared/VisibleContentRectUpdateInfo.h (212100 => 212101)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/Shared/VisibleContentRectUpdateInfo.h 2017-02-10 09:04:32 UTC (rev 212100)
+++ branches/safari-603-branch/Source/WebKit2/Shared/VisibleContentRectUpdateInfo.h 2017-02-10 09:11:36 UTC (rev 212101)
</span><span class="lines">@@ -23,7 +23,8 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#pragma once
</del><ins>+#ifndef VisibleContentRectUpdateInfo_h
+#define VisibleContentRectUpdateInfo_h
</ins><span class="cx">
</span><span class="cx"> #include <WebCore/FloatRect.h>
</span><span class="cx"> #include <wtf/MonotonicTime.h>
</span><span class="lines">@@ -46,7 +47,7 @@
</span><span class="cx">
</span><span class="cx"> VisibleContentRectUpdateInfo(const WebCore::FloatRect& exposedContentRect, const WebCore::FloatRect& unobscuredContentRect,
</span><span class="cx"> const WebCore::FloatRect& unobscuredRectInScrollViewCoordinates, const WebCore::FloatRect& unobscuredContentRectRespectingInputViewBounds, const WebCore::FloatRect& customFixedPositionRect,
</span><del>- const WebCore::FloatSize& obscuredInset, double scale, bool inStableState, bool isFirstUpdateForNewViewSize, bool isChangingObscuredInsetsInteractively, bool allowShrinkToFit, bool enclosedInScrollableAncestorView,
</del><ins>+ const WebCore::FloatSize& obscuredInset, double scale, bool inStableState, bool isChangingObscuredInsetsInteractively, bool allowShrinkToFit, bool enclosedInScrollableAncestorView,
</ins><span class="cx"> MonotonicTime timestamp, double horizontalVelocity, double verticalVelocity, double scaleChangeRate, uint64_t lastLayerTreeTransactionId)
</span><span class="cx"> : m_exposedContentRect(exposedContentRect)
</span><span class="cx"> , m_unobscuredContentRect(unobscuredContentRect)
</span><span class="lines">@@ -61,7 +62,6 @@
</span><span class="cx"> , m_verticalVelocity(verticalVelocity)
</span><span class="cx"> , m_scaleChangeRate(scaleChangeRate)
</span><span class="cx"> , m_inStableState(inStableState)
</span><del>- , m_isFirstUpdateForNewViewSize(isFirstUpdateForNewViewSize)
</del><span class="cx"> , m_isChangingObscuredInsetsInteractively(isChangingObscuredInsetsInteractively)
</span><span class="cx"> , m_allowShrinkToFit(allowShrinkToFit)
</span><span class="cx"> , m_enclosedInScrollableAncestorView(enclosedInScrollableAncestorView)
</span><span class="lines">@@ -77,7 +77,6 @@
</span><span class="cx">
</span><span class="cx"> double scale() const { return m_scale; }
</span><span class="cx"> bool inStableState() const { return m_inStableState; }
</span><del>- bool isFirstUpdateForNewViewSize() const { return m_isFirstUpdateForNewViewSize; }
</del><span class="cx"> bool isChangingObscuredInsetsInteractively() const { return m_isChangingObscuredInsetsInteractively; }
</span><span class="cx"> bool allowShrinkToFit() const { return m_allowShrinkToFit; }
</span><span class="cx"> bool enclosedInScrollableAncestorView() const { return m_enclosedInScrollableAncestorView; }
</span><span class="lines">@@ -108,7 +107,6 @@
</span><span class="cx"> double m_verticalVelocity { 0 };
</span><span class="cx"> double m_scaleChangeRate { 0 };
</span><span class="cx"> bool m_inStableState { false };
</span><del>- bool m_isFirstUpdateForNewViewSize { false };
</del><span class="cx"> bool m_isChangingObscuredInsetsInteractively { false };
</span><span class="cx"> bool m_allowShrinkToFit { false };
</span><span class="cx"> bool m_enclosedInScrollableAncestorView { false };
</span><span class="lines">@@ -126,7 +124,6 @@
</span><span class="cx"> && a.verticalVelocity() == b.verticalVelocity()
</span><span class="cx"> && a.scaleChangeRate() == b.scaleChangeRate()
</span><span class="cx"> && a.inStableState() == b.inStableState()
</span><del>- && a.isFirstUpdateForNewViewSize() == b.isFirstUpdateForNewViewSize()
</del><span class="cx"> && a.allowShrinkToFit() == b.allowShrinkToFit()
</span><span class="cx"> && a.enclosedInScrollableAncestorView() == b.enclosedInScrollableAncestorView();
</span><span class="cx"> }
</span><span class="lines">@@ -134,3 +131,5 @@
</span><span class="cx"> WebCore::TextStream& operator<<(WebCore::TextStream&, const VisibleContentRectUpdateInfo&);
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><ins>+
+#endif // VisibleContentRectUpdateInfo_h
</ins></span></pre></div>
<a id="branchessafari603branchSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (212100 => 212101)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-02-10 09:04:32 UTC (rev 212100)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-02-10 09:11:36 UTC (rev 212101)
</span><span class="lines">@@ -2063,13 +2063,8 @@
</span><span class="cx"> _page->setViewportConfigurationMinimumLayoutSize(WebCore::FloatSize(bounds.size));
</span><span class="cx"> if (!_overridesMaximumUnobscuredSize)
</span><span class="cx"> _page->setMaximumUnobscuredSize(WebCore::FloatSize(bounds.size));
</span><del>-
- BOOL sizeChanged = NO;
</del><span class="cx"> if (auto drawingArea = _page->drawingArea())
</span><del>- sizeChanged = drawingArea->setSize(WebCore::IntSize(bounds.size), WebCore::IntSize(), WebCore::IntSize());
-
- if (sizeChanged & [self usesStandardContentView])
- [_contentView setSizeChangedSinceLastVisibleContentRectUpdate:YES];
</del><ins>+ drawingArea->setSize(WebCore::IntSize(bounds.size), WebCore::IntSize(), WebCore::IntSize());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> [_customContentView web_setMinimumSize:bounds.size];
</span><span class="lines">@@ -2173,7 +2168,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (_dynamicViewportUpdateMode != DynamicViewportUpdateMode::NotResizing
</span><del>- || (_needsResetViewStateAfterCommitLoadForMainFrame && ![_contentView sizeChangedSinceLastVisibleContentRectUpdate])
</del><ins>+ || _needsResetViewStateAfterCommitLoadForMainFrame
</ins><span class="cx"> || [_scrollView isZoomBouncing]
</span><span class="cx"> || _currentlyAdjustingScrollViewInsetsForKeyboard)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2UIProcessDrawingAreaProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp (212100 => 212101)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp 2017-02-10 09:04:32 UTC (rev 212100)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp 2017-02-10 09:11:36 UTC (rev 212101)
</span><span class="lines">@@ -55,16 +55,15 @@
</span><span class="cx"> m_webPageProxy.process().removeMessageReceiver(Messages::DrawingAreaProxy::messageReceiverName(), m_webPageProxy.pageID());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool DrawingAreaProxy::setSize(const IntSize& size, const IntSize& layerPosition, const IntSize& scrollOffset)
</del><ins>+void DrawingAreaProxy::setSize(const IntSize& size, const IntSize& layerPosition, const IntSize& scrollOffset)
</ins><span class="cx"> {
</span><span class="cx"> if (m_size == size && m_layerPosition == layerPosition && scrollOffset.isZero())
</span><del>- return false;
</del><ins>+ return;
</ins><span class="cx">
</span><span class="cx"> m_size = size;
</span><span class="cx"> m_layerPosition = layerPosition;
</span><span class="cx"> m_scrollOffset += scrollOffset;
</span><span class="cx"> sizeDidChange();
</span><del>- return true;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2UIProcessDrawingAreaProxyh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/DrawingAreaProxy.h (212100 => 212101)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/UIProcess/DrawingAreaProxy.h 2017-02-10 09:04:32 UTC (rev 212100)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/DrawingAreaProxy.h 2017-02-10 09:11:36 UTC (rev 212101)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> virtual void waitForBackingStoreUpdateOnNextPaint() { }
</span><span class="cx">
</span><span class="cx"> const WebCore::IntSize& size() const { return m_size; }
</span><del>- bool setSize(const WebCore::IntSize&, const WebCore::IntSize&, const WebCore::IntSize& scrollOffset);
</del><ins>+ void setSize(const WebCore::IntSize&, const WebCore::IntSize&, const WebCore::IntSize& scrollOffset);
</ins><span class="cx">
</span><span class="cx"> // The timeout we use when waiting for a DidUpdateGeometry message.
</span><span class="cx"> static constexpr Seconds didUpdateBackingStoreStateTimeout() { return Seconds::fromMilliseconds(500); }
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (212100 => 212101)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-02-10 09:04:32 UTC (rev 212100)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-02-10 09:11:36 UTC (rev 212101)
</span><span class="lines">@@ -347,6 +347,16 @@
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="cx"> , m_fullscreenClient(std::make_unique<API::FullscreenClient>())
</span><span class="cx"> #endif
</span><ins>+#if PLATFORM(IOS)
+ , m_hasReceivedLayerTreeTransactionAfterDidCommitLoad(true)
+ , m_firstLayerTreeTransactionIdAfterDidCommitLoad(0)
+ , m_deviceOrientation(0)
+ , m_dynamicViewportSizeUpdateWaitingForTarget(false)
+ , m_dynamicViewportSizeUpdateWaitingForLayerTreeCommit(false)
+ , m_dynamicViewportSizeUpdateLayerTreeTransactionID(0)
+ , m_layerTreeTransactionIdAtLastTouchStart(0)
+ , m_hasNetworkRequestsOnSuspended(false)
+#endif
</ins><span class="cx"> , m_geolocationPermissionRequestManager(*this)
</span><span class="cx"> , m_notificationPermissionRequestManager(*this)
</span><span class="cx"> , m_activityState(ActivityState::NoFlags)
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/WebPageProxy.h (212100 => 212101)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/UIProcess/WebPageProxy.h 2017-02-10 09:04:32 UTC (rev 212100)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/WebPageProxy.h 2017-02-10 09:11:36 UTC (rev 212101)
</span><span class="lines">@@ -1667,15 +1667,15 @@
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> VisibleContentRectUpdateInfo m_lastVisibleContentRectUpdate;
</span><del>- bool m_hasReceivedLayerTreeTransactionAfterDidCommitLoad { true };
- uint64_t m_firstLayerTreeTransactionIdAfterDidCommitLoad { 0 };
- int32_t m_deviceOrientation { 0 };
- bool m_dynamicViewportSizeUpdateWaitingForTarget { false };
- bool m_dynamicViewportSizeUpdateWaitingForLayerTreeCommit { false };
- uint64_t m_dynamicViewportSizeUpdateLayerTreeTransactionID { 0 };
- uint64_t m_layerTreeTransactionIdAtLastTouchStart { 0 };
</del><ins>+ bool m_hasReceivedLayerTreeTransactionAfterDidCommitLoad;
+ uint64_t m_firstLayerTreeTransactionIdAfterDidCommitLoad;
+ int32_t m_deviceOrientation;
+ bool m_dynamicViewportSizeUpdateWaitingForTarget;
+ bool m_dynamicViewportSizeUpdateWaitingForLayerTreeCommit;
+ uint64_t m_dynamicViewportSizeUpdateLayerTreeTransactionID;
+ uint64_t m_layerTreeTransactionIdAtLastTouchStart;
</ins><span class="cx"> uint64_t m_currentDynamicViewportSizeUpdateID { 0 };
</span><del>- bool m_hasNetworkRequestsOnSuspended { false };
</del><ins>+ bool m_hasNetworkRequestsOnSuspended;
</ins><span class="cx"> bool m_isKeyboardAnimatingIn { false };
</span><span class="cx"> bool m_isScrollingOrZooming { false };
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2UIProcessiosWKContentViewh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/ios/WKContentView.h (212100 => 212101)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/UIProcess/ios/WKContentView.h 2017-02-10 09:04:32 UTC (rev 212100)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/ios/WKContentView.h 2017-02-10 09:11:36 UTC (rev 212101)
</span><span class="lines">@@ -63,7 +63,6 @@
</span><span class="cx"> @property (nonatomic, getter=isShowingInspectorIndication) BOOL showingInspectorIndication;
</span><span class="cx"> @property (nonatomic, readonly) BOOL isBackground;
</span><span class="cx"> @property (nonatomic, readonly, getter=isResigningFirstResponder) BOOL resigningFirstResponder;
</span><del>-@property (nonatomic) BOOL sizeChangedSinceLastVisibleContentRectUpdate;
</del><span class="cx">
</span><span class="cx"> - (instancetype)initWithFrame:(CGRect)frame processPool:(WebKit::WebProcessPool&)processPool configuration:(Ref<API::PageConfiguration>&&)configuration webView:(WKWebView *)webView;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2UIProcessiosWKContentViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/ios/WKContentView.mm (212100 => 212101)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/UIProcess/ios/WKContentView.mm 2017-02-10 09:04:32 UTC (rev 212100)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/ios/WKContentView.mm 2017-02-10 09:11:36 UTC (rev 212101)
</span><span class="lines">@@ -414,7 +414,6 @@
</span><span class="cx"> WebCore::FloatSize(obscuredInset),
</span><span class="cx"> zoomScale,
</span><span class="cx"> isStableState,
</span><del>- _sizeChangedSinceLastVisibleContentRectUpdate,
</del><span class="cx"> isChangingObscuredInsetsInteractively,
</span><span class="cx"> _webView._allowsViewportShrinkToFit,
</span><span class="cx"> enclosedInScrollableAncestorView,
</span><span class="lines">@@ -429,7 +428,6 @@
</span><span class="cx"> bool wasStableState = _page->inStableState();
</span><span class="cx"> _page->updateVisibleContentRects(visibleContentRectUpdateInfo);
</span><span class="cx">
</span><del>- _sizeChangedSinceLastVisibleContentRectUpdate = NO;
</del><span class="cx">
</span><span class="cx"> FloatRect fixedPositionRect = _page->computeCustomFixedPositionRect(_page->unobscuredContentRect(), _page->unobscuredContentRectRespectingInputViewBounds(), _page->customFixedPositionRect(), zoomScale, WebPageProxy::UnobscuredRectConstraint::Unconstrained, scrollingCoordinator->visualViewportEnabled());
</span><span class="cx"> scrollingCoordinator->viewportChangedViaDelegatedScrolling(scrollingCoordinator->rootScrollingNodeID(), fixedPositionRect, zoomScale);
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (212100 => 212101)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2017-02-10 09:04:32 UTC (rev 212100)
+++ branches/safari-603-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2017-02-10 09:11:36 UTC (rev 212101)
</span><span class="lines">@@ -3011,12 +3011,12 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::updateVisibleContentRects(const VisibleContentRectUpdateInfo& visibleContentRectUpdateInfo, MonotonicTime oldestTimestamp)
</span><span class="cx"> {
</span><del>- LOG_WITH_STREAM(VisibleRects, stream << "\nWebPage::updateVisibleContentRects " << visibleContentRectUpdateInfo);
-
</del><span class="cx"> // Skip any VisibleContentRectUpdate that have been queued before DidCommitLoad suppresses the updates in the UIProcess.
</span><del>- if (visibleContentRectUpdateInfo.lastLayerTreeTransactionID() < m_mainFrame->firstLayerTreeTransactionIDAfterDidCommitLoad() && !visibleContentRectUpdateInfo.isFirstUpdateForNewViewSize())
</del><ins>+ if (visibleContentRectUpdateInfo.lastLayerTreeTransactionID() < m_mainFrame->firstLayerTreeTransactionIDAfterDidCommitLoad())
</ins><span class="cx"> return;
</span><span class="cx">
</span><ins>+ LOG_WITH_STREAM(VisibleRects, stream << "\nWebPage::updateVisibleContentRects " << visibleContentRectUpdateInfo);
+
</ins><span class="cx"> m_hasReceivedVisibleContentRectsAfterDidCommitLoad = true;
</span><span class="cx"> m_isInStableState = visibleContentRectUpdateInfo.inStableState();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>