<!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>[162480] 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/162480">162480</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-01-21 15:54:34 -0800 (Tue, 21 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove #if PLATFORM(IOS) in various places around customFixedPositionLayoutRect() code
https://bugs.webkit.org/show_bug.cgi?id=127373
Reviewed by Beth Dakin.
Instead of PLATFORM(IOS) #idefs at every call site for viewportConstrainedVisibleContentRect(),
move the #ifdef inside viewportConstrainedVisibleContentRect().
The one call site that needs special handling is RenderLayerBacking::updateCompositedBounds(),
which needs to avoid clipping fixed layers to the custom fixed position rect, but instead to
visibleContentRect() (which is really the document bounds on iOS). This ensures that the
fixed layers aren't clipped when zooming out.
* page/FrameView.cpp:
(WebCore::FrameView::viewportConstrainedVisibleContentRect):
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::stickyPositionOffset):
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::updateCompositedBounds):
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::requiresCompositingForPosition):
(WebCore::RenderLayerCompositor::computeFixedViewportConstraints):
(WebCore::RenderLayerCompositor::computeStickyViewportConstraints):</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="#trunkSourceWebCorerenderingRenderBoxModelObjectcpp">trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</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 (162479 => 162480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-21 23:49:57 UTC (rev 162479)
+++ trunk/Source/WebCore/ChangeLog 2014-01-21 23:54:34 UTC (rev 162480)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-01-21 Simon Fraser <simon.fraser@apple.com>
+
+ Remove #if PLATFORM(IOS) in various places around customFixedPositionLayoutRect() code
+ https://bugs.webkit.org/show_bug.cgi?id=127373
+
+ Reviewed by Beth Dakin.
+
+ Instead of PLATFORM(IOS) #idefs at every call site for viewportConstrainedVisibleContentRect(),
+ move the #ifdef inside viewportConstrainedVisibleContentRect().
+
+ The one call site that needs special handling is RenderLayerBacking::updateCompositedBounds(),
+ which needs to avoid clipping fixed layers to the custom fixed position rect, but instead to
+ visibleContentRect() (which is really the document bounds on iOS). This ensures that the
+ fixed layers aren't clipped when zooming out.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::viewportConstrainedVisibleContentRect):
+ * rendering/RenderBoxModelObject.cpp:
+ (WebCore::RenderBoxModelObject::stickyPositionOffset):
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::updateCompositedBounds):
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::requiresCompositingForPosition):
+ (WebCore::RenderLayerCompositor::computeFixedViewportConstraints):
+ (WebCore::RenderLayerCompositor::computeStickyViewportConstraints):
+
</ins><span class="cx"> 2014-01-21 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Allow all clients to link against WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (162479 => 162480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2014-01-21 23:49:57 UTC (rev 162479)
+++ trunk/Source/WebCore/page/FrameView.cpp 2014-01-21 23:54:34 UTC (rev 162480)
</span><span class="lines">@@ -1618,6 +1618,10 @@
</span><span class="cx">
</span><span class="cx"> LayoutRect FrameView::viewportConstrainedVisibleContentRect() const
</span><span class="cx"> {
</span><ins>+#if PLATFORM(IOS)
+ if (useCustomFixedPositionLayoutRect())
+ return customFixedPositionLayoutRect();
+#endif
</ins><span class="cx"> LayoutRect viewportRect = visibleContentRect();
</span><span class="cx"> viewportRect.setLocation(toPoint(scrollOffsetForFixedPosition()));
</span><span class="cx"> return viewportRect;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (162479 => 162480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2014-01-21 23:49:57 UTC (rev 162479)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2014-01-21 23:54:34 UTC (rev 162480)
</span><span class="lines">@@ -432,11 +432,7 @@
</span><span class="cx"> FloatPoint scrollOffset = FloatPoint() + enclosingClippingLayer->scrollOffset();
</span><span class="cx"> constrainingRect.setLocation(scrollOffset);
</span><span class="cx"> } else {
</span><del>-#if PLATFORM(IOS)
- LayoutRect viewportRect = view().frameView().customFixedPositionLayoutRect();
-#else
</del><span class="cx"> LayoutRect viewportRect = view().frameView().viewportConstrainedVisibleContentRect();
</span><del>-#endif
</del><span class="cx"> float scale = view().frameView().frame().frameScaleFactor();
</span><span class="cx"> viewportRect.scale(1 / scale);
</span><span class="cx"> constrainingRect = viewportRect;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (162479 => 162480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-01-21 23:49:57 UTC (rev 162479)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-01-21 23:54:34 UTC (rev 162480)
</span><span class="lines">@@ -489,9 +489,13 @@
</span><span class="cx"> RenderLayer* rootLayer = view.layer();
</span><span class="cx">
</span><span class="cx"> LayoutRect clippingBounds;
</span><del>- if (renderer().style().position() == FixedPosition && renderer().container() == &view)
</del><ins>+ if (renderer().style().position() == FixedPosition && renderer().container() == &view) {
+#if PLATFORM(IOS)
+ clippingBounds = view.frameView().visibleContentRect();
+#else
</ins><span class="cx"> clippingBounds = view.frameView().viewportConstrainedVisibleContentRect();
</span><del>- else
</del><ins>+#endif
+ } else
</ins><span class="cx"> clippingBounds = view.unscaledDocumentRect();
</span><span class="cx">
</span><span class="cx"> if (&m_owningLayer != rootLayer)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (162479 => 162480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-01-21 23:49:57 UTC (rev 162479)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-01-21 23:54:34 UTC (rev 162480)
</span><span class="lines">@@ -2557,11 +2557,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Fixed position elements that are invisible in the current view don't get their own layer.
</span><del>-#if PLATFORM(IOS)
- LayoutRect viewBounds = m_renderView.frameView().customFixedPositionLayoutRect();
-#else
</del><span class="cx"> LayoutRect viewBounds = m_renderView.frameView().viewportConstrainedVisibleContentRect();
</span><del>-#endif
</del><span class="cx"> LayoutRect layerBounds = layer.calculateLayerBounds(&layer, 0, RenderLayer::UseLocalClipRectIfPossible | RenderLayer::IncludeLayerFilterOutsets | RenderLayer::UseFragmentBoxes
</span><span class="cx"> | RenderLayer::ExcludeHiddenDescendants | RenderLayer::DontConstrainForMask | RenderLayer::IncludeCompositedDescendants);
</span><span class="cx"> // Map to m_renderView to ignore page scale.
</span><span class="lines">@@ -3385,16 +3381,10 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(layer.isComposited());
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- LayoutRect viewportRect = m_renderView.frameView().customFixedPositionLayoutRect();
-#else
</del><ins>+ GraphicsLayer* graphicsLayer = layer.backing()->graphicsLayer();
</ins><span class="cx"> LayoutRect viewportRect = m_renderView.frameView().viewportConstrainedVisibleContentRect();
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> FixedPositionViewportConstraints constraints;
</span><del>-
- GraphicsLayer* graphicsLayer = layer.backing()->graphicsLayer();
-
</del><span class="cx"> constraints.setLayerPositionAtLastLayout(graphicsLayer->position());
</span><span class="cx"> constraints.setViewportRectAtLastLayout(viewportRect);
</span><span class="cx">
</span><span class="lines">@@ -3431,12 +3421,7 @@
</span><span class="cx"> ASSERT(!layer.enclosingOverflowClipLayer(ExcludeSelf));
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- LayoutRect viewportRect = m_renderView.frameView().customFixedPositionLayoutRect();
-#else
</del><span class="cx"> LayoutRect viewportRect = m_renderView.frameView().viewportConstrainedVisibleContentRect();
</span><del>-#endif
-
</del><span class="cx"> RenderBoxModelObject& renderer = toRenderBoxModelObject(layer.renderer());
</span><span class="cx">
</span><span class="cx"> StickyPositionViewportConstraints constraints;
</span></span></pre>
</div>
</div>
</body>
</html>