<!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>[169408] 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/169408">169408</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-05-27 21:44:48 -0700 (Tue, 27 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Prepare for position:sticky support inside accelerated overflow-scroll with WK2
https://bugs.webkit.org/show_bug.cgi?id=133329
Reviewed by Tim Horton.
RenderLayerCompositor::computeStickyViewportConstraints() was always using
the viewport rect as the constraining rect for sticky position. This is not
correct when inside overflow:scroll.
Refactor code in RenderBoxModelObject to make getting the rect easy, and use
it to compute the constraints.
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::constrainingRectForStickyPosition):
(WebCore::RenderBoxModelObject::stickyPositionOffset):
* rendering/RenderBoxModelObject.h:
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::computeStickyViewportConstraints):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxModelObjectcpp">trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxModelObjecth">trunk/Source/WebCore/rendering/RenderBoxModelObject.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169407 => 169408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-28 01:33:26 UTC (rev 169407)
+++ trunk/Source/WebCore/ChangeLog 2014-05-28 04:44:48 UTC (rev 169408)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-05-27 Simon Fraser <simon.fraser@apple.com>
+
+ Prepare for position:sticky support inside accelerated overflow-scroll with WK2
+ https://bugs.webkit.org/show_bug.cgi?id=133329
+
+ Reviewed by Tim Horton.
+
+ RenderLayerCompositor::computeStickyViewportConstraints() was always using
+ the viewport rect as the constraining rect for sticky position. This is not
+ correct when inside overflow:scroll.
+
+ Refactor code in RenderBoxModelObject to make getting the rect easy, and use
+ it to compute the constraints.
+
+ * rendering/RenderBoxModelObject.cpp:
+ (WebCore::RenderBoxModelObject::constrainingRectForStickyPosition):
+ (WebCore::RenderBoxModelObject::stickyPositionOffset):
+ * rendering/RenderBoxModelObject.h:
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::computeStickyViewportConstraints):
+
</ins><span class="cx"> 2014-05-27 Bem Jones-Bey <bjonesbe@adobe.com>
</span><span class="cx">
</span><span class="cx"> vw/vh units used as font/line-height values don't scale with the viewport
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (169407 => 169408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2014-05-28 01:33:26 UTC (rev 169407)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2014-05-28 04:44:48 UTC (rev 169408)
</span><span class="lines">@@ -435,28 +435,33 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-LayoutSize RenderBoxModelObject::stickyPositionOffset() const
</del><ins>+FloatRect RenderBoxModelObject::constrainingRectForStickyPosition() const
</ins><span class="cx"> {
</span><del>- FloatRect constrainingRect;
-
- ASSERT(hasLayer());
</del><span class="cx"> RenderLayer* enclosingClippingLayer = layer()->enclosingOverflowClipLayer(ExcludeSelf);
</span><span class="cx"> if (enclosingClippingLayer) {
</span><span class="cx"> RenderBox& enclosingClippingBox = toRenderBox(enclosingClippingLayer->renderer());
</span><span class="cx"> LayoutRect clipRect = enclosingClippingBox.overflowClipRect(LayoutPoint(), 0); // FIXME: make this work in regions.
</span><span class="cx"> clipRect.contract(LayoutSize(enclosingClippingBox.paddingLeft() + enclosingClippingBox.paddingRight(),
</span><span class="cx"> enclosingClippingBox.paddingTop() + enclosingClippingBox.paddingBottom()));
</span><del>- constrainingRect = enclosingClippingBox.localToContainerQuad(FloatRect(clipRect), &view()).boundingBox();
</del><span class="cx">
</span><ins>+ FloatRect constrainingRect = enclosingClippingBox.localToContainerQuad(FloatRect(clipRect), &view()).boundingBox();
+
</ins><span class="cx"> FloatPoint scrollOffset = FloatPoint() + enclosingClippingLayer->scrollOffset();
</span><span class="cx"> constrainingRect.setLocation(scrollOffset);
</span><del>- } else {
- LayoutRect viewportRect = view().frameView().viewportConstrainedVisibleContentRect();
- float scale = view().frameView().frame().frameScaleFactor();
- viewportRect.scale(1 / scale);
- constrainingRect = viewportRect;
</del><ins>+ return constrainingRect;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ LayoutRect viewportRect = view().frameView().viewportConstrainedVisibleContentRect();
+ float scale = frame().frameScaleFactor();
+ viewportRect.scale(1 / scale);
+ return viewportRect;
+}
+
+LayoutSize RenderBoxModelObject::stickyPositionOffset() const
+{
+ ASSERT(hasLayer());
+
+ FloatRect constrainingRect = constrainingRectForStickyPosition();
</ins><span class="cx"> StickyPositionViewportConstraints constraints;
</span><span class="cx"> computeStickyPositionConstraints(constraints, constrainingRect);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.h (169407 => 169408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.h 2014-05-28 01:33:26 UTC (rev 169407)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.h 2014-05-28 04:44:48 UTC (rev 169408)
</span><span class="lines">@@ -69,7 +69,8 @@
</span><span class="cx"> LayoutSize relativePositionOffset() const;
</span><span class="cx"> LayoutSize relativePositionLogicalOffset() const { return style().isHorizontalWritingMode() ? relativePositionOffset() : relativePositionOffset().transposedSize(); }
</span><span class="cx">
</span><del>- void computeStickyPositionConstraints(StickyPositionViewportConstraints&, const FloatRect& viewportRect) const;
</del><ins>+ FloatRect constrainingRectForStickyPosition() const;
+ void computeStickyPositionConstraints(StickyPositionViewportConstraints&, const FloatRect& constrainingRect) const;
</ins><span class="cx"> LayoutSize stickyPositionOffset() const;
</span><span class="cx"> LayoutSize stickyPositionLogicalOffset() const { return style().isHorizontalWritingMode() ? stickyPositionOffset() : stickyPositionOffset().transposedSize(); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (169407 => 169408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-05-28 01:33:26 UTC (rev 169407)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-05-28 04:44:48 UTC (rev 169408)
</span><span class="lines">@@ -3558,11 +3558,10 @@
</span><span class="cx"> ASSERT(!layer.enclosingOverflowClipLayer(ExcludeSelf));
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- LayoutRect viewportRect = m_renderView.frameView().viewportConstrainedVisibleContentRect();
</del><span class="cx"> RenderBoxModelObject& renderer = toRenderBoxModelObject(layer.renderer());
</span><span class="cx">
</span><span class="cx"> StickyPositionViewportConstraints constraints;
</span><del>- renderer.computeStickyPositionConstraints(constraints, viewportRect);
</del><ins>+ renderer.computeStickyPositionConstraints(constraints, renderer.constrainingRectForStickyPosition());
</ins><span class="cx">
</span><span class="cx"> GraphicsLayer* graphicsLayer = layer.backing()->graphicsLayer();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>