<!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>[168233] trunk/Source/WebCore</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/168233">168233</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-03 18:48:37 -0700 (Sat, 03 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS][WK2] Support disabling speculative tiling
https://bugs.webkit.org/show_bug.cgi?id=132512
Reviewed by Tim Horton.
Move ScrollView::setScrollVelocity() and ScrollView::computeCoverageRect() to FrameView.
When speculative tiling is disabled, return an unmodified exposed rect.
Time/velocity adjusments are completely unnecessary at the moment since speculative tiling
is enabled as soon as the view scrolls.
* WebCore.exp.in:
* page/FrameView.cpp:
(WebCore::FrameView::setScrollVelocity):
(WebCore::FrameView::computeCoverageRect):
* page/FrameView.h:
* platform/ScrollView.h:
* platform/ios/ScrollViewIOS.mm:
(WebCore::ScrollView::setScrollVelocity): Deleted.
(WebCore::ScrollView::computeCoverageRect): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</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="#trunkSourceWebCoreplatformScrollViewh">trunk/Source/WebCore/platform/ScrollView.h</a></li>
<li><a href="#trunkSourceWebCoreplatformiosScrollViewIOSmm">trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168232 => 168233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-04 00:17:11 UTC (rev 168232)
+++ trunk/Source/WebCore/ChangeLog 2014-05-04 01:48:37 UTC (rev 168233)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-05-03 Benjamin Poulain <benjamin@webkit.org>
+
+ [iOS][WK2] Support disabling speculative tiling
+ https://bugs.webkit.org/show_bug.cgi?id=132512
+
+ Reviewed by Tim Horton.
+
+ Move ScrollView::setScrollVelocity() and ScrollView::computeCoverageRect() to FrameView.
+ When speculative tiling is disabled, return an unmodified exposed rect.
+
+ Time/velocity adjusments are completely unnecessary at the moment since speculative tiling
+ is enabled as soon as the view scrolls.
+
+ * WebCore.exp.in:
+ * page/FrameView.cpp:
+ (WebCore::FrameView::setScrollVelocity):
+ (WebCore::FrameView::computeCoverageRect):
+ * page/FrameView.h:
+ * platform/ScrollView.h:
+ * platform/ios/ScrollViewIOS.mm:
+ (WebCore::ScrollView::setScrollVelocity): Deleted.
+ (WebCore::ScrollView::computeCoverageRect): Deleted.
+
</ins><span class="cx"> 2014-05-02 Pratik Solanki <psolanki@apple.com>
</span><span class="cx">
</span><span class="cx"> Shortcircuit shouldUseCredentialStorage callback
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (168232 => 168233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-05-04 00:17:11 UTC (rev 168232)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-05-04 01:48:37 UTC (rev 168233)
</span><span class="lines">@@ -2438,8 +2438,8 @@
</span><span class="cx"> _WebUIApplicationDidBecomeActiveNotification
</span><span class="cx"> _WebUIApplicationWillEnterForegroundNotification
</span><span class="cx"> _WebUIApplicationWillResignActiveNotification
</span><ins>+__ZN7WebCore9FrameView17setScrollVelocityEdddd
</ins><span class="cx"> __ZN7WebCore10ScrollView15setScrollOffsetERKNS_8IntPointE
</span><del>-__ZN7WebCore10ScrollView17setScrollVelocityEdddd
</del><span class="cx"> __ZN7WebCore10ScrollView21setExposedContentRectERKNS_7IntRectE
</span><span class="cx"> __ZN7WebCore10ScrollView24setUnobscuredContentRectERKNS_7IntRectE
</span><span class="cx"> __ZN7WebCore10XLinkNames4initEv
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (168232 => 168233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2014-05-04 00:17:11 UTC (rev 168232)
+++ trunk/Source/WebCore/page/FrameView.cpp 2014-05-04 01:48:37 UTC (rev 168233)
</span><span class="lines">@@ -4107,6 +4107,58 @@
</span><span class="cx"> }
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><ins>+
+void FrameView::setScrollVelocity(double horizontalVelocity, double verticalVelocity, double scaleChangeRate, double timestamp)
+{
+ m_horizontalVelocity = horizontalVelocity;
+ m_verticalVelocity = verticalVelocity;
+ m_scaleChangeRate = scaleChangeRate;
+ m_lastVelocityUpdateTime = timestamp;
+}
+
+FloatRect FrameView::computeCoverageRect(double horizontalMargin, double verticalMargin) const
+{
+ FloatRect exposedContentRect = this->exposedContentRect();
+ if (!m_speculativeTilingEnabled)
+ return exposedContentRect;
+
+ double currentTime = monotonicallyIncreasingTime();
+ double timeDelta = currentTime - m_lastVelocityUpdateTime;
+
+ FloatRect futureRect = exposedContentRect;
+ futureRect.setLocation(FloatPoint(futureRect.location().x() + timeDelta * m_horizontalVelocity, futureRect.location().y() + timeDelta * m_verticalVelocity));
+
+ if (m_horizontalVelocity) {
+ futureRect.setWidth(futureRect.width() + horizontalMargin);
+ if (m_horizontalVelocity < 0)
+ futureRect.setX(futureRect.x() - horizontalMargin);
+ }
+
+ if (m_verticalVelocity) {
+ futureRect.setHeight(futureRect.height() + verticalMargin);
+ if (m_verticalVelocity < 0)
+ futureRect.setY(futureRect.y() - verticalMargin);
+ }
+
+ if (m_scaleChangeRate <= 0 && !m_horizontalVelocity && !m_verticalVelocity) {
+ futureRect.setWidth(futureRect.width() + horizontalMargin);
+ futureRect.setHeight(futureRect.height() + verticalMargin);
+ futureRect.setX(futureRect.x() - horizontalMargin / 2);
+ futureRect.setY(futureRect.y() - verticalMargin / 2);
+ }
+
+ IntSize contentSize = contentsSize();
+ if (futureRect.maxX() > contentSize.width())
+ futureRect.setX(contentSize.width() - futureRect.width());
+ if (futureRect.maxY() > contentSize.height())
+ futureRect.setY(contentSize.height() - futureRect.height());
+ if (futureRect.x() < 0)
+ futureRect.setX(0);
+ if (futureRect.y() < 0)
+ futureRect.setY(0);
+
+ return futureRect;
+}
</ins><span class="cx"> #endif // PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> void FrameView::setScrollingPerformanceLoggingEnabled(bool flag)
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.h (168232 => 168233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.h 2014-05-04 00:17:11 UTC (rev 168232)
+++ trunk/Source/WebCore/page/FrameView.h 2014-05-04 01:48:37 UTC (rev 168233)
</span><span class="lines">@@ -129,6 +129,9 @@
</span><span class="cx"> IntRect customFixedPositionLayoutRect() const { return m_customFixedPositionLayoutRect; }
</span><span class="cx"> void setCustomFixedPositionLayoutRect(const IntRect&);
</span><span class="cx"> bool updateFixedPositionLayoutRect();
</span><ins>+
+ void setScrollVelocity(double horizontalVelocity, double verticalVelocity, double scaleChangeRate, double timestamp);
+ FloatRect computeCoverageRect(double horizontalMargin, double verticalMargin) const;
</ins><span class="cx"> #else
</span><span class="cx"> bool useCustomFixedPositionLayoutRect() const { return false; }
</span><span class="cx"> #endif
</span><span class="lines">@@ -684,6 +687,11 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> bool m_useCustomFixedPositionLayoutRect;
</span><span class="cx"> IntRect m_customFixedPositionLayoutRect;
</span><ins>+
+ double m_horizontalVelocity;
+ double m_verticalVelocity;
+ double m_scaleChangeRate;
+ double m_lastVelocityUpdateTime;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> IntSize m_overrideViewportSize;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollView.h (168232 => 168233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollView.h 2014-05-04 00:17:11 UTC (rev 168232)
+++ trunk/Source/WebCore/platform/ScrollView.h 2014-05-04 01:48:37 UTC (rev 168233)
</span><span class="lines">@@ -188,9 +188,6 @@
</span><span class="cx"> void setExposedContentRect(const IntRect&);
</span><span class="cx"> void setUnobscuredContentRect(const IntRect&);
</span><span class="cx">
</span><del>- void setScrollVelocity(double horizontalVelocity, double verticalVelocity, double scaleChangeRate, double timestamp);
- FloatRect computeCoverageRect(double horizontalMargin, double verticalMargin) const;
-
</del><span class="cx"> void setActualScrollPosition(const IntPoint&);
</span><span class="cx"> LegacyTileCache* legacyTileCache();
</span><span class="cx"> #endif
</span><span class="lines">@@ -423,11 +420,6 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> IntRect m_exposedContentRect;
</span><span class="cx"> IntRect m_unobscuredContentRect;
</span><del>-
- double m_horizontalVelocity;
- double m_verticalVelocity;
- double m_scaleChangeRate;
- double m_lastVelocityUpdateTime;
</del><span class="cx"> #else
</span><span class="cx"> IntRect m_fixedVisibleContentRect;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosScrollViewIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm (168232 => 168233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm 2014-05-04 00:17:11 UTC (rev 168232)
+++ trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm 2014-05-04 01:48:37 UTC (rev 168233)
</span><span class="lines">@@ -119,56 +119,6 @@
</span><span class="cx"> m_unobscuredContentRect = rect;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollView::setScrollVelocity(double horizontalVelocity, double verticalVelocity, double scaleChangeRate, double timestamp)
-{
- m_horizontalVelocity = horizontalVelocity;
- m_verticalVelocity = verticalVelocity;
- m_scaleChangeRate = scaleChangeRate;
- m_lastVelocityUpdateTime = timestamp;
-}
-
-FloatRect ScrollView::computeCoverageRect(double horizontalMargin, double verticalMargin) const
-{
- FloatRect exposedContentRect = this->exposedContentRect();
-
- double currentTime = monotonicallyIncreasingTime();
- double timeDelta = currentTime - m_lastVelocityUpdateTime;
-
- FloatRect futureRect = exposedContentRect;
- futureRect.setLocation(FloatPoint(futureRect.location().x() + timeDelta * m_horizontalVelocity, futureRect.location().y() + timeDelta * m_verticalVelocity));
-
- if (m_horizontalVelocity) {
- futureRect.setWidth(futureRect.width() + horizontalMargin);
- if (m_horizontalVelocity < 0)
- futureRect.setX(futureRect.x() - horizontalMargin);
- }
-
- if (m_verticalVelocity) {
- futureRect.setHeight(futureRect.height() + verticalMargin);
- if (m_verticalVelocity < 0)
- futureRect.setY(futureRect.y() - verticalMargin);
- }
-
- if (m_scaleChangeRate <= 0 && !m_horizontalVelocity && !m_verticalVelocity) {
- futureRect.setWidth(futureRect.width() + horizontalMargin);
- futureRect.setHeight(futureRect.height() + verticalMargin);
- futureRect.setX(futureRect.x() - horizontalMargin / 2);
- futureRect.setY(futureRect.y() - verticalMargin / 2);
- }
-
- IntSize contentSize = contentsSize();
- if (futureRect.maxX() > contentSize.width())
- futureRect.setX(contentSize.width() - futureRect.width());
- if (futureRect.maxY() > contentSize.height())
- futureRect.setY(contentSize.height() - futureRect.height());
- if (futureRect.x() < 0)
- futureRect.setX(0);
- if (futureRect.y() < 0)
- futureRect.setY(0);
-
- return futureRect;
-}
-
</del><span class="cx"> IntRect ScrollView::exposedContentRect() const
</span><span class="cx"> {
</span><span class="cx"> if (NSScrollView *view = static_cast<NSScrollView *>(platformWidget())) {
</span></span></pre>
</div>
</div>
</body>
</html>