<!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>[200161] trunk/Source</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/200161">200161</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-04-27 16:51:40 -0700 (Wed, 27 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS WK2] When determining tile size, check whether ancestor UIScrollViews are actually scrollable
https://bugs.webkit.org/show_bug.cgi?id=157107
rdar://problem/25943577
Reviewed by Tim Horton.
Source/WebCore:
Rename "enclosedInScrollView" to "enclosedInScrollableAncestorView" everywhere.
* page/FrameView.cpp:
(WebCore::FrameView::adjustTiledBackingScrollability):
* page/Page.h:
(WebCore::Page::enclosedInScrollableAncestorView):
(WebCore::Page::setEnclosedInScrollableAncestorView):
(WebCore::Page::enclosedInScrollView): Deleted.
(WebCore::Page::setEnclosedInScrollView): Deleted.
Source/WebKit2:
We should only fall back to 512x512 tiles if the WKWebView has a UIScrollView ancestor,
and that UIScrollView actually scrolls. This avoids falling back to small tiles in
MobileSafari.
Rename "enclosedInScrollView" to "enclosedInScrollableAncestorView" everywhere.
* Shared/VisibleContentRectUpdateInfo.cpp:
(WebKit::VisibleContentRectUpdateInfo::encode):
(WebKit::VisibleContentRectUpdateInfo::decode):
* Shared/VisibleContentRectUpdateInfo.h:
(WebKit::VisibleContentRectUpdateInfo::VisibleContentRectUpdateInfo):
(WebKit::VisibleContentRectUpdateInfo::enclosedInScrollableAncestorView):
(WebKit::operator==):
(WebKit::VisibleContentRectUpdateInfo::enclosedInScrollView): Deleted.
* UIProcess/API/Cocoa/WKWebView.mm:
(scrollViewCanScroll):
(-[WKWebView _updateContentRectsWithState:]):
* UIProcess/ios/WKContentView.h:
* UIProcess/ios/WKContentView.mm:
(-[WKContentView didUpdateVisibleRect:unobscuredRect:unobscuredRectInScrollViewCoordinates:obscuredInset:scale:minimumScale:inStableState:isChangingObscuredInsetsInteractively:enclosedInScrollableAncestorView:]):
(-[WKContentView didUpdateVisibleRect:unobscuredRect:unobscuredRectInScrollViewCoordinates:obscuredInset:scale:minimumScale:inStableState:isChangingObscuredInsetsInteractively:enclosedInScrollView:]): Deleted.
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::updateVisibleContentRects):</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="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedVisibleContentRectUpdateInfocpp">trunk/Source/WebKit2/Shared/VisibleContentRectUpdateInfo.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedVisibleContentRectUpdateInfoh">trunk/Source/WebKit2/Shared/VisibleContentRectUpdateInfo.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewh">trunk/Source/WebKit2/UIProcess/ios/WKContentView.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewmm">trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200160 => 200161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-27 23:51:35 UTC (rev 200160)
+++ trunk/Source/WebCore/ChangeLog 2016-04-27 23:51:40 UTC (rev 200161)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-04-27 Simon Fraser <simon.fraser@apple.com>
+
+ [iOS WK2] When determining tile size, check whether ancestor UIScrollViews are actually scrollable
+ https://bugs.webkit.org/show_bug.cgi?id=157107
+ rdar://problem/25943577
+
+ Reviewed by Tim Horton.
+
+ Rename "enclosedInScrollView" to "enclosedInScrollableAncestorView" everywhere.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::adjustTiledBackingScrollability):
+ * page/Page.h:
+ (WebCore::Page::enclosedInScrollableAncestorView):
+ (WebCore::Page::setEnclosedInScrollableAncestorView):
+ (WebCore::Page::enclosedInScrollView): Deleted.
+ (WebCore::Page::setEnclosedInScrollView): Deleted.
+
</ins><span class="cx"> 2016-04-27 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [SOUP] Implement PlatformCookieJar::addCookie
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (200160 => 200161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2016-04-27 23:51:35 UTC (rev 200160)
+++ trunk/Source/WebCore/page/FrameView.cpp 2016-04-27 23:51:40 UTC (rev 200161)
</span><span class="lines">@@ -2487,7 +2487,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> if (Page* page = frame().page())
</span><del>- clippedByAncestorView |= page->enclosedInScrollView();
</del><ins>+ clippedByAncestorView |= page->enclosedInScrollableAncestorView();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (delegatesScrolling()) {
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (200160 => 200161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2016-04-27 23:51:35 UTC (rev 200160)
+++ trunk/Source/WebCore/page/Page.h 2016-04-27 23:51:40 UTC (rev 200161)
</span><span class="lines">@@ -299,8 +299,8 @@
</span><span class="cx"> FloatSize obscuredInset() const { return m_obscuredInset; }
</span><span class="cx"> void setObscuredInset(FloatSize inset) { m_obscuredInset = inset; }
</span><span class="cx">
</span><del>- bool enclosedInScrollView() const { return m_enclosedInScrollView; }
- void setEnclosedInScrollView(bool f) { m_enclosedInScrollView = f; }
</del><ins>+ bool enclosedInScrollableAncestorView() const { return m_enclosedInScrollableAncestorView; }
+ void setEnclosedInScrollableAncestorView(bool f) { m_enclosedInScrollableAncestorView = f; }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(IOS_TEXT_AUTOSIZING)
</span><span class="lines">@@ -612,7 +612,7 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> // This is only used for history scroll position restoration.
</span><span class="cx"> FloatSize m_obscuredInset;
</span><del>- bool m_enclosedInScrollView { false };
</del><ins>+ bool m_enclosedInScrollableAncestorView { false };
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(IOS_TEXT_AUTOSIZING)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (200160 => 200161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-04-27 23:51:35 UTC (rev 200160)
+++ trunk/Source/WebKit2/ChangeLog 2016-04-27 23:51:40 UTC (rev 200161)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2016-04-27 Simon Fraser <simon.fraser@apple.com>
+
+ [iOS WK2] When determining tile size, check whether ancestor UIScrollViews are actually scrollable
+ https://bugs.webkit.org/show_bug.cgi?id=157107
+ rdar://problem/25943577
+
+ Reviewed by Tim Horton.
+
+ We should only fall back to 512x512 tiles if the WKWebView has a UIScrollView ancestor,
+ and that UIScrollView actually scrolls. This avoids falling back to small tiles in
+ MobileSafari.
+
+ Rename "enclosedInScrollView" to "enclosedInScrollableAncestorView" everywhere.
+
+ * Shared/VisibleContentRectUpdateInfo.cpp:
+ (WebKit::VisibleContentRectUpdateInfo::encode):
+ (WebKit::VisibleContentRectUpdateInfo::decode):
+ * Shared/VisibleContentRectUpdateInfo.h:
+ (WebKit::VisibleContentRectUpdateInfo::VisibleContentRectUpdateInfo):
+ (WebKit::VisibleContentRectUpdateInfo::enclosedInScrollableAncestorView):
+ (WebKit::operator==):
+ (WebKit::VisibleContentRectUpdateInfo::enclosedInScrollView): Deleted.
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (scrollViewCanScroll):
+ (-[WKWebView _updateContentRectsWithState:]):
+ * UIProcess/ios/WKContentView.h:
+ * UIProcess/ios/WKContentView.mm:
+ (-[WKContentView didUpdateVisibleRect:unobscuredRect:unobscuredRectInScrollViewCoordinates:obscuredInset:scale:minimumScale:inStableState:isChangingObscuredInsetsInteractively:enclosedInScrollableAncestorView:]):
+ (-[WKContentView didUpdateVisibleRect:unobscuredRect:unobscuredRectInScrollViewCoordinates:obscuredInset:scale:minimumScale:inStableState:isChangingObscuredInsetsInteractively:enclosedInScrollView:]): Deleted.
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::updateVisibleContentRects):
+
</ins><span class="cx"> 2016-04-26 Ada Chan <adachan@apple.com>
</span><span class="cx">
</span><span class="cx"> Set WebVideoFullscreenInterfaceMac up as a client of WebPlaybackSessionInterfaceMac to listen for playback state changes
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedVisibleContentRectUpdateInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/VisibleContentRectUpdateInfo.cpp (200160 => 200161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/VisibleContentRectUpdateInfo.cpp 2016-04-27 23:51:35 UTC (rev 200160)
+++ trunk/Source/WebKit2/Shared/VisibleContentRectUpdateInfo.cpp 2016-04-27 23:51:40 UTC (rev 200161)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> encoder << m_inStableState;
</span><span class="cx"> encoder << m_isChangingObscuredInsetsInteractively;
</span><span class="cx"> encoder << m_allowShrinkToFit;
</span><del>- encoder << m_enclosedInScrollView;
</del><ins>+ encoder << m_enclosedInScrollableAncestorView;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool VisibleContentRectUpdateInfo::decode(IPC::ArgumentDecoder& decoder, VisibleContentRectUpdateInfo& result)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(result.m_allowShrinkToFit))
</span><span class="cx"> return false;
</span><del>- if (!decoder.decode(result.m_enclosedInScrollView))
</del><ins>+ if (!decoder.decode(result.m_enclosedInScrollableAncestorView))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedVisibleContentRectUpdateInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/VisibleContentRectUpdateInfo.h (200160 => 200161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/VisibleContentRectUpdateInfo.h 2016-04-27 23:51:35 UTC (rev 200160)
+++ trunk/Source/WebKit2/Shared/VisibleContentRectUpdateInfo.h 2016-04-27 23:51:40 UTC (rev 200161)
</span><span class="lines">@@ -41,7 +41,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& customFixedPositionRect,
</span><del>- const WebCore::FloatSize& obscuredInset, double scale, bool inStableState, bool isChangingObscuredInsetsInteractively, bool allowShrinkToFit, bool enclosedInScrollView,
</del><ins>+ const WebCore::FloatSize& obscuredInset, double scale, bool inStableState, bool isChangingObscuredInsetsInteractively, bool allowShrinkToFit, bool enclosedInScrollableAncestorView,
</ins><span class="cx"> double 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">@@ -57,7 +57,7 @@
</span><span class="cx"> , m_inStableState(inStableState)
</span><span class="cx"> , m_isChangingObscuredInsetsInteractively(isChangingObscuredInsetsInteractively)
</span><span class="cx"> , m_allowShrinkToFit(allowShrinkToFit)
</span><del>- , m_enclosedInScrollView(enclosedInScrollView)
</del><ins>+ , m_enclosedInScrollableAncestorView(enclosedInScrollableAncestorView)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> bool inStableState() const { return m_inStableState; }
</span><span class="cx"> bool isChangingObscuredInsetsInteractively() const { return m_isChangingObscuredInsetsInteractively; }
</span><span class="cx"> bool allowShrinkToFit() const { return m_allowShrinkToFit; }
</span><del>- bool enclosedInScrollView() const { return m_enclosedInScrollView; }
</del><ins>+ bool enclosedInScrollableAncestorView() const { return m_enclosedInScrollableAncestorView; }
</ins><span class="cx">
</span><span class="cx"> double timestamp() const { return m_timestamp; }
</span><span class="cx"> double horizontalVelocity() const { return m_horizontalVelocity; }
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> bool m_inStableState { false };
</span><span class="cx"> bool m_isChangingObscuredInsetsInteractively { false };
</span><span class="cx"> bool m_allowShrinkToFit { false };
</span><del>- bool m_enclosedInScrollView { false };
</del><ins>+ bool m_enclosedInScrollableAncestorView { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> inline bool operator==(const VisibleContentRectUpdateInfo& a, const VisibleContentRectUpdateInfo& b)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> && a.scaleChangeRate() == b.scaleChangeRate()
</span><span class="cx"> && a.inStableState() == b.inStableState()
</span><span class="cx"> && a.allowShrinkToFit() == b.allowShrinkToFit()
</span><del>- && a.enclosedInScrollView() == b.enclosedInScrollView();
</del><ins>+ && a.enclosedInScrollableAncestorView() == b.enclosedInScrollableAncestorView();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (200160 => 200161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-04-27 23:51:35 UTC (rev 200160)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-04-27 23:51:40 UTC (rev 200161)
</span><span class="lines">@@ -1986,6 +1986,19 @@
</span><span class="cx"> [self _updateContentRectsWithState:isStableState];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool scrollViewCanScroll(UIScrollView *scrollView)
+{
+ if (!scrollView)
+ return NO;
+
+ UIEdgeInsets contentInset = scrollView.contentInset;
+ CGSize contentSize = scrollView.contentSize;
+ CGSize boundsSize = scrollView.bounds.size;
+
+ return (contentSize.width + contentInset.left + contentInset.right) > boundsSize.width
+ || (contentSize.height + contentInset.top + contentInset.bottom) > boundsSize.height;
+}
+
</ins><span class="cx"> - (void)_updateContentRectsWithState:(BOOL)inStableState
</span><span class="cx"> {
</span><span class="cx"> if (![self usesStandardContentView]) {
</span><span class="lines">@@ -2042,7 +2055,7 @@
</span><span class="cx"> scale:scaleFactor minimumScale:[_scrollView minimumZoomScale]
</span><span class="cx"> inStableState:inStableState
</span><span class="cx"> isChangingObscuredInsetsInteractively:_isChangingObscuredInsetsInteractively
</span><del>- enclosedInScrollView:[self _scroller] != nil];
</del><ins>+ enclosedInScrollableAncestorView:scrollViewCanScroll([self _scroller])];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_didFinishLoadForMainFrame
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentView.h (200160 => 200161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentView.h 2016-04-27 23:51:35 UTC (rev 200160)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentView.h 2016-04-27 23:51:40 UTC (rev 200161)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> scale:(CGFloat)scale minimumScale:(CGFloat)minimumScale
</span><span class="cx"> inStableState:(BOOL)isStableState
</span><span class="cx"> isChangingObscuredInsetsInteractively:(BOOL)isChangingObscuredInsetsInteractively
</span><del>- enclosedInScrollView:(BOOL)enclosedInScrollView;
</del><ins>+ enclosedInScrollableAncestorView:(BOOL)enclosedInScrollableAncestorView;
</ins><span class="cx">
</span><span class="cx"> - (void)didFinishScrolling;
</span><span class="cx"> - (void)didInterruptScrolling;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm (200160 => 200161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm 2016-04-27 23:51:35 UTC (rev 200160)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm 2016-04-27 23:51:40 UTC (rev 200161)
</span><span class="lines">@@ -356,7 +356,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)didUpdateVisibleRect:(CGRect)visibleRect unobscuredRect:(CGRect)unobscuredRect unobscuredRectInScrollViewCoordinates:(CGRect)unobscuredRectInScrollViewCoordinates
</span><del>- obscuredInset:(CGSize)obscuredInset scale:(CGFloat)zoomScale minimumScale:(CGFloat)minimumScale inStableState:(BOOL)isStableState isChangingObscuredInsetsInteractively:(BOOL)isChangingObscuredInsetsInteractively enclosedInScrollView:(BOOL)enclosedInScrollView
</del><ins>+ obscuredInset:(CGSize)obscuredInset scale:(CGFloat)zoomScale minimumScale:(CGFloat)minimumScale inStableState:(BOOL)isStableState isChangingObscuredInsetsInteractively:(BOOL)isChangingObscuredInsetsInteractively enclosedInScrollableAncestorView:(BOOL)enclosedInScrollableAncestorView
</ins><span class="cx"> {
</span><span class="cx"> auto drawingArea = _page->drawingArea();
</span><span class="cx"> if (!drawingArea)
</span><span class="lines">@@ -381,7 +381,7 @@
</span><span class="cx"> isStableState,
</span><span class="cx"> isChangingObscuredInsetsInteractively,
</span><span class="cx"> _webView._allowsViewportShrinkToFit,
</span><del>- enclosedInScrollView,
</del><ins>+ enclosedInScrollableAncestorView,
</ins><span class="cx"> timestamp,
</span><span class="cx"> velocityData.horizontalVelocity,
</span><span class="cx"> velocityData.verticalVelocity,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (200160 => 200161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-04-27 23:51:35 UTC (rev 200160)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-04-27 23:51:40 UTC (rev 200161)
</span><span class="lines">@@ -2967,7 +2967,7 @@
</span><span class="cx">
</span><span class="cx"> frameView.setUnobscuredContentSize(visibleContentRectUpdateInfo.unobscuredContentRect().size());
</span><span class="cx"> m_page->setObscuredInset(visibleContentRectUpdateInfo.obscuredInset());
</span><del>- m_page->setEnclosedInScrollView(visibleContentRectUpdateInfo.enclosedInScrollView());
</del><ins>+ m_page->setEnclosedInScrollableAncestorView(visibleContentRectUpdateInfo.enclosedInScrollableAncestorView());
</ins><span class="cx">
</span><span class="cx"> double horizontalVelocity = visibleContentRectUpdateInfo.horizontalVelocity();
</span><span class="cx"> double verticalVelocity = visibleContentRectUpdateInfo.verticalVelocity();
</span></span></pre>
</div>
</div>
</body>
</html>