<!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>[165666] 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/165666">165666</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-03-14 18:03:02 -0700 (Fri, 14 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS WK2] background-attachment: fixed renders oddly, moves around
https://bugs.webkit.org/show_bug.cgi?id=130277
<rdar://problem/16332883>
Source/WebCore:
Reviewed by Tim Horton.
If we have a counter-scrolling layer (for a fixed background), move
it around when changing the viewport.
* page/scrolling/ios/ScrollingTreeScrollingNodeIOS.mm:
(WebCore::ScrollingTreeScrollingNodeIOS::updateForViewport):
Source/WebKit2:
Reviewed by Tim Horton.
Actually send scrolling and counter-scrolling layers to the UI process!
* Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp:
(ArgumentCoder<ScrollingStateScrollingNode>::encode):
(ArgumentCoder<ScrollingStateScrollingNode>::decode):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagescrollingiosScrollingTreeScrollingNodeIOSmm">trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeScrollingNodeIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedScrollingRemoteScrollingCoordinatorTransactioncpp">trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165665 => 165666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-15 00:35:48 UTC (rev 165665)
+++ trunk/Source/WebCore/ChangeLog 2014-03-15 01:03:02 UTC (rev 165666)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-03-14 Simon Fraser <simon.fraser@apple.com>
+
+ [iOS WK2] background-attachment: fixed renders oddly, moves around
+ https://bugs.webkit.org/show_bug.cgi?id=130277
+ <rdar://problem/16332883>
+
+ Reviewed by Tim Horton.
+
+ If we have a counter-scrolling layer (for a fixed background), move
+ it around when changing the viewport.
+
+ * page/scrolling/ios/ScrollingTreeScrollingNodeIOS.mm:
+ (WebCore::ScrollingTreeScrollingNodeIOS::updateForViewport):
+
</ins><span class="cx"> 2014-03-14 Jae Hyun Park <jaepark@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Texmap] Remove duplicated code in TextureMapperLayer
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingiosScrollingTreeScrollingNodeIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeScrollingNodeIOS.mm (165665 => 165666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeScrollingNodeIOS.mm 2014-03-15 00:35:48 UTC (rev 165665)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeScrollingNodeIOS.mm 2014-03-15 01:03:02 UTC (rev 165666)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> void ScrollingTreeScrollingNodeIOS::setScrollLayerPosition(const FloatPoint& position)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!shouldUpdateScrollLayerPositionSynchronously());
</span><del>- m_scrollLayer.get().position = CGPointMake(-position.x() + scrollOrigin().x(), -position.y() + scrollOrigin().y());
</del><ins>+ [m_scrollLayer setPosition:CGPointMake(-position.x() + scrollOrigin().x(), -position.y() + scrollOrigin().y())];
</ins><span class="cx">
</span><span class="cx"> ScrollBehaviorForFixedElements behaviorForFixed = scrollBehaviorForFixedElements();
</span><span class="cx"> FloatPoint scrollOffset = position - toIntSize(scrollOrigin());
</span><span class="lines">@@ -140,9 +140,9 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: scrollOffsetForFixedPosition() needs to do float math.
</span><span class="cx"> FloatSize scrollOffsetForFixedChildren = FrameView::scrollOffsetForFixedPosition(enclosingLayoutRect(viewportRect), totalContentsSize(), flooredIntPoint(scrollOffset), scrollOrigin(), frameScaleFactor(), false, behaviorForFixed, headerHeight(), footerHeight());
</span><del>- if (m_counterScrollingLayer)
- m_counterScrollingLayer.get().position = FloatPoint(scrollOffsetForFixedChildren);
</del><span class="cx">
</span><ins>+ [m_counterScrollingLayer setPosition:FloatPoint(scrollOffsetForFixedChildren)];
+
</ins><span class="cx"> if (m_headerLayer || m_footerLayer) {
</span><span class="cx"> // Generally the banners should have the same horizontal-position computation as a fixed element. However,
</span><span class="cx"> // the banners are not affected by the frameScaleFactor(), so if there is currently a non-1 frameScaleFactor()
</span><span class="lines">@@ -152,10 +152,10 @@
</span><span class="cx"> horizontalScrollOffsetForBanner = FrameView::scrollOffsetForFixedPosition(enclosingLayoutRect(viewportRect), totalContentsSize(), flooredIntPoint(scrollOffset), scrollOrigin(), 1, false, behaviorForFixed, headerHeight(), footerHeight()).width();
</span><span class="cx">
</span><span class="cx"> if (m_headerLayer)
</span><del>- m_headerLayer.get().position = FloatPoint(horizontalScrollOffsetForBanner, 0);
</del><ins>+ [m_headerLayer setPosition:FloatPoint(horizontalScrollOffsetForBanner, 0)];
</ins><span class="cx">
</span><span class="cx"> if (m_footerLayer)
</span><del>- m_footerLayer.get().position = FloatPoint(horizontalScrollOffsetForBanner, totalContentsSize().height() - footerHeight());
</del><ins>+ [m_footerLayer setPosition:FloatPoint(horizontalScrollOffsetForBanner, totalContentsSize().height() - footerHeight())];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!m_children)
</span><span class="lines">@@ -172,6 +172,8 @@
</span><span class="cx">
</span><span class="cx"> void ScrollingTreeScrollingNodeIOS::updateForViewport(const FloatRect& viewportRect, double scale)
</span><span class="cx"> {
</span><ins>+ [m_counterScrollingLayer setPosition:viewportRect.location()];
+
</ins><span class="cx"> if (!m_children)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (165665 => 165666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-15 00:35:48 UTC (rev 165665)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-15 01:03:02 UTC (rev 165666)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-03-14 Simon Fraser <simon.fraser@apple.com>
+
+ [iOS WK2] background-attachment: fixed renders oddly, moves around
+ https://bugs.webkit.org/show_bug.cgi?id=130277
+ <rdar://problem/16332883>
+
+ Reviewed by Tim Horton.
+
+ Actually send scrolling and counter-scrolling layers to the UI process!
+
+ * Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp:
+ (ArgumentCoder<ScrollingStateScrollingNode>::encode):
+ (ArgumentCoder<ScrollingStateScrollingNode>::decode):
+
</ins><span class="cx"> 2014-03-14 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Try to fix the iOS build.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedScrollingRemoteScrollingCoordinatorTransactioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp (165665 => 165666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp 2014-03-15 00:35:48 UTC (rev 165665)
+++ trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp 2014-03-15 01:03:02 UTC (rev 165666)
</span><span class="lines">@@ -122,6 +122,12 @@
</span><span class="cx"> SCROLLING_NODE_ENCODE(RequestedScrollPosition, requestedScrollPositionRepresentsProgrammaticScroll)
</span><span class="cx"> SCROLLING_NODE_ENCODE(HeaderHeight, headerHeight)
</span><span class="cx"> SCROLLING_NODE_ENCODE(FooterHeight, footerHeight)
</span><ins>+
+ if (node.hasChangedProperty(ScrollingStateScrollingNode::ScrolledContentsLayer))
+ encoder << static_cast<GraphicsLayer::PlatformLayerID>(node.scrolledContentsLayer());
+
+ if (node.hasChangedProperty(ScrollingStateScrollingNode::CounterScrollingLayer))
+ encoder << static_cast<GraphicsLayer::PlatformLayerID>(node.counterScrollingLayer());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #define SCROLLING_NODE_DECODE(property, type, setter) \
</span><span class="lines">@@ -171,6 +177,20 @@
</span><span class="cx"> SCROLLING_NODE_DECODE(HeaderHeight, int, setHeaderHeight);
</span><span class="cx"> SCROLLING_NODE_DECODE(FooterHeight, int, setFooterHeight);
</span><span class="cx">
</span><ins>+ if (node.hasChangedProperty(ScrollingStateScrollingNode::ScrolledContentsLayer)) {
+ GraphicsLayer::PlatformLayerID layerID;
+ if (!decoder.decode(layerID))
+ return false;
+ node.setScrolledContentsLayer(layerID);
+ }
+
+ if (node.hasChangedProperty(ScrollingStateScrollingNode::CounterScrollingLayer)) {
+ GraphicsLayer::PlatformLayerID layerID;
+ if (!decoder.decode(layerID))
+ return false;
+ node.setCounterScrollingLayer(layerID);
+ }
+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>