<!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>[163146] 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/163146">163146</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-01-30 17:47:45 -0800 (Thu, 30 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixed position objects are clipped in iOS WK2
https://bugs.webkit.org/show_bug.cgi?id=127974
Reviewed by Darin Adler.
We clip compositing layers for fixed position objects to the viewport
to avoid huge layers. However, because iOS changes the fixed position
rect when zooming, we need a different rect for iOS.
In WK1 (when we have a platformWidget), we can use
visibleContentRect(ScrollableArea::LegacyIOSDocumentVisibleRect)
which is effectively the whole document. However in WK2 this is
the real visibleContentRect(), so there we use unscaledDocumentRect().
* page/FrameView.cpp:
(WebCore::FrameView::viewportConstrainedExtentRect):
* page/FrameView.h:
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::updateCompositedBounds):</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="#trunkSourceWebCorepageFrameViewh">trunk/Source/WebCore/page/FrameView.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163145 => 163146)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-31 01:46:00 UTC (rev 163145)
+++ trunk/Source/WebCore/ChangeLog 2014-01-31 01:47:45 UTC (rev 163146)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-01-30 Simon Fraser <simon.fraser@apple.com>
+
+ Fixed position objects are clipped in iOS WK2
+ https://bugs.webkit.org/show_bug.cgi?id=127974
+
+ Reviewed by Darin Adler.
+
+ We clip compositing layers for fixed position objects to the viewport
+ to avoid huge layers. However, because iOS changes the fixed position
+ rect when zooming, we need a different rect for iOS.
+
+ In WK1 (when we have a platformWidget), we can use
+ visibleContentRect(ScrollableArea::LegacyIOSDocumentVisibleRect)
+ which is effectively the whole document. However in WK2 this is
+ the real visibleContentRect(), so there we use unscaledDocumentRect().
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::viewportConstrainedExtentRect):
+ * page/FrameView.h:
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::updateCompositedBounds):
+
</ins><span class="cx"> 2014-01-28 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Add column number and call timing support to LegacyProfiler.
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (163145 => 163146)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2014-01-31 01:46:00 UTC (rev 163145)
+++ trunk/Source/WebCore/page/FrameView.cpp 2014-01-31 01:47:45 UTC (rev 163146)
</span><span class="lines">@@ -1561,6 +1561,18 @@
</span><span class="cx"> return viewportRect;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+LayoutRect FrameView::viewportConstrainedExtentRect() const
+{
+#if PLATFORM(IOS)
+ if (platformWidget())
+ return visibleContentRect(ScrollableArea::LegacyIOSDocumentVisibleRect);
+
+ return renderView()->unscaledDocumentRect();
+#else
+ return viewportConstrainedVisibleContentRect();
+#endif
+}
+
</ins><span class="cx"> IntSize FrameView::scrollOffsetForFixedPosition(const IntRect& visibleContentRect, const IntSize& totalContentsSize, const IntPoint& scrollPosition, const IntPoint& scrollOrigin, float frameScaleFactor, bool fixedElementsLayoutRelativeToFrame, ScrollBehaviorForFixedElements behaviorForFixed, int headerHeight, int footerHeight)
</span><span class="cx"> {
</span><span class="cx"> IntPoint position;
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.h (163145 => 163146)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.h 2014-01-31 01:46:00 UTC (rev 163145)
+++ trunk/Source/WebCore/page/FrameView.h 2014-01-31 01:47:45 UTC (rev 163146)
</span><span class="lines">@@ -226,6 +226,9 @@
</span><span class="cx"> // offsets from rubber-banding, and it takes zooming into account.
</span><span class="cx"> LayoutRect viewportConstrainedVisibleContentRect() const;
</span><span class="cx">
</span><ins>+ // A rectangle in content coordinates that is used to clip layers for fixed-position objects.
+ LayoutRect viewportConstrainedExtentRect() const;
+
</ins><span class="cx"> String mediaType() const;
</span><span class="cx"> void setMediaType(const String&);
</span><span class="cx"> void adjustMediaTypeForPrinting(bool printing);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (163145 => 163146)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-01-31 01:46:00 UTC (rev 163145)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-01-31 01:47:45 UTC (rev 163146)
</span><span class="lines">@@ -476,13 +476,9 @@
</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) {
-#if PLATFORM(IOS)
- clippingBounds = view.frameView().visibleContentRect(ScrollableArea::LegacyIOSDocumentVisibleRect);
-#else
- clippingBounds = view.frameView().viewportConstrainedVisibleContentRect();
-#endif
- } else
</del><ins>+ if (renderer().style().position() == FixedPosition && renderer().container() == &view)
+ clippingBounds = view.frameView().viewportConstrainedExtentRect();
+ else
</ins><span class="cx"> clippingBounds = view.unscaledDocumentRect();
</span><span class="cx">
</span><span class="cx"> if (&m_owningLayer != rootLayer)
</span></span></pre>
</div>
</div>
</body>
</html>