<!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>[180848] 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/180848">180848</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-02-28 20:36:39 -0800 (Sat, 28 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Viewport units should not dirty style just before we do layout
https://bugs.webkit.org/show_bug.cgi?id=141682
Reviewed by Zalan Bujtas.
Source/WebCore:
In documents using viewport units, we dirtied style every time layout changed
the size of the document. This is nonsensical, because viewport units depend on the
viewport size, not the document size.
Move the style dirtying from layout() into availableContentSizeChanged(). Hook
this up for WebKit1 by calling from -[WebFrameView _frameSizeChanged], and,
since that causes availableContentSizeChanged() to be called for WK1 for the first
time, protect the call to updateScrollbars() with a !platformWidget check.
Covered by existing viewport unit tests.
* page/FrameView.cpp:
(WebCore::FrameView::layout):
(WebCore::FrameView::availableContentSizeChanged):
(WebCore::FrameView::viewportSizeForCSSViewportUnits): Add a FIXME comment. Whether
scrollbars are ignored depends on the value of the overflow property on the root element.
* page/FrameView.h:
* platform/ScrollView.cpp:
(WebCore::ScrollView::availableContentSizeChanged):
Source/WebKit/mac:
* WebView/WebFrameView.mm:
(-[WebFrameView _frameSizeChanged]):</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="#trunkSourceWebCoreplatformScrollViewcpp">trunk/Source/WebCore/platform/ScrollView.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFrameViewmm">trunk/Source/WebKit/mac/WebView/WebFrameView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (180847 => 180848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-01 02:31:16 UTC (rev 180847)
+++ trunk/Source/WebCore/ChangeLog 2015-03-01 04:36:39 UTC (rev 180848)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-02-28 Simon Fraser <simon.fraser@apple.com>
+
+ Viewport units should not dirty style just before we do layout
+ https://bugs.webkit.org/show_bug.cgi?id=141682
+
+ Reviewed by Zalan Bujtas.
+
+ In documents using viewport units, we dirtied style every time layout changed
+ the size of the document. This is nonsensical, because viewport units depend on the
+ viewport size, not the document size.
+
+ Move the style dirtying from layout() into availableContentSizeChanged(). Hook
+ this up for WebKit1 by calling from -[WebFrameView _frameSizeChanged], and,
+ since that causes availableContentSizeChanged() to be called for WK1 for the first
+ time, protect the call to updateScrollbars() with a !platformWidget check.
+
+ Covered by existing viewport unit tests.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::layout):
+ (WebCore::FrameView::availableContentSizeChanged):
+ (WebCore::FrameView::viewportSizeForCSSViewportUnits): Add a FIXME comment. Whether
+ scrollbars are ignored depends on the value of the overflow property on the root element.
+ * page/FrameView.h:
+ * platform/ScrollView.cpp:
+ (WebCore::ScrollView::availableContentSizeChanged):
+
</ins><span class="cx"> 2015-02-28 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] Purge SQLite page cache when under memory pressure.
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (180847 => 180848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2015-03-01 02:31:16 UTC (rev 180847)
+++ trunk/Source/WebCore/page/FrameView.cpp 2015-03-01 04:36:39 UTC (rev 180848)
</span><span class="lines">@@ -1288,8 +1288,6 @@
</span><span class="cx"> bodyRenderer->setChildNeedsLayout();
</span><span class="cx"> else if (rootRenderer && rootRenderer->stretchesToViewport())
</span><span class="cx"> rootRenderer->setChildNeedsLayout();
</span><del>-
- document.updateViewportUnitsOnResize();
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2291,6 +2289,9 @@
</span><span class="cx">
</span><span class="cx"> void FrameView::availableContentSizeChanged(AvailableSizeChangeReason reason)
</span><span class="cx"> {
</span><ins>+ if (Document* document = frame().document())
+ document->updateViewportUnitsOnResize();
+
</ins><span class="cx"> setNeedsLayout();
</span><span class="cx"> ScrollView::availableContentSizeChanged(reason);
</span><span class="cx"> }
</span><span class="lines">@@ -4726,8 +4727,11 @@
</span><span class="cx"> m_overrideViewportSize = size;
</span><span class="cx"> m_hasOverrideViewportSize = true;
</span><span class="cx">
</span><del>- if (Document* document = m_frame->document())
</del><ins>+ if (Document* document = m_frame->document()) {
+ // FIXME: this should probably be updateViewportUnitsOnResize(), but synchronously
+ // dirtying style here causes assertions on iOS (rdar://problem/19998166).
</ins><span class="cx"> document->styleResolverChanged(DeferRecalcStyle);
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IntSize FrameView::viewportSizeForCSSViewportUnits() const
</span><span class="lines">@@ -4735,6 +4739,8 @@
</span><span class="cx"> if (m_hasOverrideViewportSize)
</span><span class="cx"> return m_overrideViewportSize;
</span><span class="cx">
</span><ins>+ // FIXME: the value returned should take into account the value of the overflow
+ // property on the root element.
</ins><span class="cx"> return visibleContentRectIncludingScrollbars().size();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.h (180847 => 180848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.h 2015-03-01 02:31:16 UTC (rev 180847)
+++ trunk/Source/WebCore/page/FrameView.h 2015-03-01 04:36:39 UTC (rev 180848)
</span><span class="lines">@@ -488,6 +488,8 @@
</span><span class="cx"> WEBCORE_EXPORT virtual void willStartLiveResize() override;
</span><span class="cx"> WEBCORE_EXPORT virtual void willEndLiveResize() override;
</span><span class="cx">
</span><ins>+ WEBCORE_EXPORT virtual void availableContentSizeChanged(AvailableSizeChangeReason) override;
+
</ins><span class="cx"> void addPaintPendingMilestones(LayoutMilestones);
</span><span class="cx"> void firePaintRelatedMilestonesIfNeeded();
</span><span class="cx"> void fireLayoutRelatedMilestonesIfNeeded();
</span><span class="lines">@@ -581,7 +583,6 @@
</span><span class="cx">
</span><span class="cx"> virtual void repaintContentRectangle(const IntRect&) override;
</span><span class="cx"> virtual void updateContentsSize() override;
</span><del>- virtual void availableContentSizeChanged(AvailableSizeChangeReason) override;
</del><span class="cx"> virtual void addedOrRemovedScrollbar() override;
</span><span class="cx">
</span><span class="cx"> virtual void delegatesScrollingDidChange() override;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollView.cpp (180847 => 180848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollView.cpp 2015-03-01 02:31:16 UTC (rev 180847)
+++ trunk/Source/WebCore/platform/ScrollView.cpp 2015-03-01 04:36:39 UTC (rev 180848)
</span><span class="lines">@@ -366,6 +366,10 @@
</span><span class="cx"> void ScrollView::availableContentSizeChanged(AvailableSizeChangeReason reason)
</span><span class="cx"> {
</span><span class="cx"> ScrollableArea::availableContentSizeChanged(reason);
</span><ins>+
+ if (platformWidget())
+ return;
+
</ins><span class="cx"> if (reason != AvailableSizeChangeReason::ScrollbarsChanged)
</span><span class="cx"> updateScrollbars(scrollOffset());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (180847 => 180848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-03-01 02:31:16 UTC (rev 180847)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-03-01 04:36:39 UTC (rev 180848)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-02-28 Simon Fraser <simon.fraser@apple.com>
+
+ Viewport units should not dirty style just before we do layout
+ https://bugs.webkit.org/show_bug.cgi?id=141682
+
+ Reviewed by Zalan Bujtas.
+
+ * WebView/WebFrameView.mm:
+ (-[WebFrameView _frameSizeChanged]):
+
</ins><span class="cx"> 2015-02-26 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename DatabaseManager::manager() to DatabaseManager::singleton()
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFrameViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrameView.mm (180847 => 180848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrameView.mm 2015-03-01 02:31:16 UTC (rev 180847)
+++ trunk/Source/WebKit/mac/WebView/WebFrameView.mm 2015-03-01 04:36:39 UTC (rev 180848)
</span><span class="lines">@@ -351,7 +351,7 @@
</span><span class="cx"> [[self _scrollView] setDrawsBackground:YES];
</span><span class="cx"> if (Frame* coreFrame = [self _web_frame]) {
</span><span class="cx"> if (FrameView* coreFrameView = coreFrame->view())
</span><del>- coreFrameView->setNeedsLayout();
</del><ins>+ coreFrameView->availableContentSizeChanged(ScrollableArea::AvailableSizeChangeReason::AreaSizeChanged);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>