<!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>[163182] 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/163182">163182</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-01-31 11:36:57 -0800 (Fri, 31 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Even when in fixed layout mode, some platforms need to do layout after a viewport change
https://bugs.webkit.org/show_bug.cgi?id=128003
Reviewed by Andreas Kling.
iOS uses fixed layout mode in both WK1 and WK2, but lays out fixed position
elements relative to a variable viewport. This code assumed that fixed layout
implies a fixed viewport.
Fix by testing for useCustomFixedPositionLayoutRect() in the fixed layout case.
Also removed RenderView::hasCustomFixedPosition() which is no longer used.
* page/FrameView.cpp:
(WebCore::FrameView::shouldLayoutAfterViewportChange):
(WebCore::FrameView::visibleContentsResized):
* page/FrameView.h:
* rendering/RenderView.cpp:
* rendering/RenderView.h:</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="#trunkSourceWebCorerenderingRenderViewcpp">trunk/Source/WebCore/rendering/RenderView.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewh">trunk/Source/WebCore/rendering/RenderView.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163181 => 163182)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-31 19:34:11 UTC (rev 163181)
+++ trunk/Source/WebCore/ChangeLog 2014-01-31 19:36:57 UTC (rev 163182)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-01-31 Simon Fraser <simon.fraser@apple.com>
+
+ Even when in fixed layout mode, some platforms need to do layout after a viewport change
+ https://bugs.webkit.org/show_bug.cgi?id=128003
+
+ Reviewed by Andreas Kling.
+
+ iOS uses fixed layout mode in both WK1 and WK2, but lays out fixed position
+ elements relative to a variable viewport. This code assumed that fixed layout
+ implies a fixed viewport.
+
+ Fix by testing for useCustomFixedPositionLayoutRect() in the fixed layout case.
+
+ Also removed RenderView::hasCustomFixedPosition() which is no longer used.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::shouldLayoutAfterViewportChange):
+ (WebCore::FrameView::visibleContentsResized):
+ * page/FrameView.h:
+ * rendering/RenderView.cpp:
+ * rendering/RenderView.h:
+
</ins><span class="cx"> 2014-01-31 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Guard GLContextEGL::platformContext() with USE(3D_GRAPHICS)
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (163181 => 163182)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2014-01-31 19:34:11 UTC (rev 163181)
+++ trunk/Source/WebCore/page/FrameView.cpp 2014-01-31 19:36:57 UTC (rev 163182)
</span><span class="lines">@@ -2139,6 +2139,11 @@
</span><span class="cx"> ScrollView::fixedLayoutSizeChanged();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool FrameView::shouldLayoutAfterViewportChange() const
+{
+ return hasViewportConstrainedObjects() && (!useFixedLayout() || useCustomFixedPositionLayoutRect());
+}
+
</ins><span class="cx"> void FrameView::visibleContentsResized()
</span><span class="cx"> {
</span><span class="cx"> // We check to make sure the view is attached to a frame() as this method can
</span><span class="lines">@@ -2160,7 +2165,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (!useFixedLayout() && needsLayout())
</del><ins>+ if (shouldLayoutAfterViewportChange() && needsLayout())
</ins><span class="cx"> layout();
</span><span class="cx">
</span><span class="cx"> if (RenderView* renderView = this->renderView()) {
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.h (163181 => 163182)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.h 2014-01-31 19:34:11 UTC (rev 163181)
+++ trunk/Source/WebCore/page/FrameView.h 2014-01-31 19:36:57 UTC (rev 163182)
</span><span class="lines">@@ -129,6 +129,8 @@
</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>+#else
+ bool useCustomFixedPositionLayoutRect() const { return false; }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(REQUEST_ANIMATION_FRAME)
</span><span class="lines">@@ -479,6 +481,7 @@
</span><span class="cx"> bool useSlowRepaintsIfNotOverlapped() const;
</span><span class="cx"> void updateCanBlitOnScrollRecursively();
</span><span class="cx"> bool contentsInCompositedLayer() const;
</span><ins>+ bool shouldLayoutAfterViewportChange() const;
</ins><span class="cx">
</span><span class="cx"> bool shouldUpdateCompositingLayersAfterScrolling() const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.cpp (163181 => 163182)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.cpp 2014-01-31 19:34:11 UTC (rev 163181)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2014-01-31 19:36:57 UTC (rev 163182)
</span><span class="lines">@@ -1197,24 +1197,6 @@
</span><span class="cx"> return *m_flowThreadController;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
-static bool isFixedPositionInViewport(const RenderObject& renderer, const RenderObject* container)
-{
- return (renderer.style().position() == FixedPosition) && renderer.container() == container;
-}
-
-bool RenderView::hasCustomFixedPosition(const RenderObject& renderer, ContainingBlockCheck checkContainer) const
-{
- if (!frameView().useCustomFixedPositionLayoutRect())
- return false;
-
- if (checkContainer == CheckContainingBlock)
- return isFixedPositionInViewport(renderer, this);
-
- return renderer.style().position() == FixedPosition;
-}
-#endif
-
</del><span class="cx"> void RenderView::pushLayoutStateForCurrentFlowThread(const RenderObject& object)
</span><span class="cx"> {
</span><span class="cx"> if (!m_flowThreadController)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.h (163181 => 163182)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.h 2014-01-31 19:34:11 UTC (rev 163181)
+++ trunk/Source/WebCore/rendering/RenderView.h 2014-01-31 19:36:57 UTC (rev 163182)
</span><span class="lines">@@ -191,11 +191,6 @@
</span><span class="cx">
</span><span class="cx"> virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- enum ContainingBlockCheck { CheckContainingBlock, DontCheckContainingBlock };
- bool hasCustomFixedPosition(const RenderObject&, ContainingBlockCheck = CheckContainingBlock) const;
-#endif
-
</del><span class="cx"> IntervalArena* intervalArena();
</span><span class="cx">
</span><span class="cx"> IntSize viewportSize() const;
</span></span></pre>
</div>
</div>
</body>
</html>