<!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>[167630] 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/167630">167630</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2014-04-21 15:22:35 -0700 (Mon, 21 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>topContentInset does not play well with fullscreen elements
https://bugs.webkit.org/show_bug.cgi?id=131955
-and corresponding-
<rdar://problem/16651925>
Reviewed by Sam Weinig.
Source/WebCore:
Calling setNeedsLayout() is not sufficient when the topContentInset has changed
dynamically. We need to perform the layout right away and update the scrollbars.
This works completely when the inset changes due to entering/exiting fullscreen,
but I left a FIXME behind because it is possible to change the inset dynamically
just through the WK2 API and end up in a situation where everything looks right
except for the scrollbars.
* page/FrameView.cpp:
(WebCore::FrameView::topContentInsetDidChange):
* page/FrameView.h:
* page/Page.cpp:
(WebCore::Page::setTopContentInset):
Source/WebKit2:
If you take an element (such as a <video>) fullscreen when you have a
topContentInset set, there will be an inset-sized gap at the top of the fullscreen
video.
Save and restore the topContentInset whenever the scroll position is saved and
restored.
* WebProcess/FullScreen/WebFullScreenManager.cpp:
(WebKit::WebFullScreenManager::WebFullScreenManager):
(WebKit::WebFullScreenManager::saveScrollPosition):
(WebKit::WebFullScreenManager::restoreScrollPosition):
* WebProcess/FullScreen/WebFullScreenManager.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="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessFullScreenWebFullScreenManagercpp">trunk/Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessFullScreenWebFullScreenManagerh">trunk/Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167629 => 167630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-21 21:49:04 UTC (rev 167629)
+++ trunk/Source/WebCore/ChangeLog 2014-04-21 22:22:35 UTC (rev 167630)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-04-21 Beth Dakin <bdakin@apple.com>
+
+ topContentInset does not play well with fullscreen elements
+ https://bugs.webkit.org/show_bug.cgi?id=131955
+ -and corresponding-
+ <rdar://problem/16651925>
+
+ Reviewed by Sam Weinig.
+
+ Calling setNeedsLayout() is not sufficient when the topContentInset has changed
+ dynamically. We need to perform the layout right away and update the scrollbars.
+ This works completely when the inset changes due to entering/exiting fullscreen,
+ but I left a FIXME behind because it is possible to change the inset dynamically
+ just through the WK2 API and end up in a situation where everything looks right
+ except for the scrollbars.
+ * page/FrameView.cpp:
+ (WebCore::FrameView::topContentInsetDidChange):
+ * page/FrameView.h:
+ * page/Page.cpp:
+ (WebCore::Page::setTopContentInset):
+
</ins><span class="cx"> 2014-04-18 Jon Honeycutt <jhoneycutt@apple.com>
</span><span class="cx">
</span><span class="cx"> Empty RenderInline objects should not be line break objects.
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (167629 => 167630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2014-04-21 21:49:04 UTC (rev 167629)
+++ trunk/Source/WebCore/page/FrameView.cpp 2014-04-21 22:22:35 UTC (rev 167630)
</span><span class="lines">@@ -950,6 +950,18 @@
</span><span class="cx"> return page ? page->topContentInset() : 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void FrameView::topContentInsetDidChange()
+{
+ RenderView* renderView = this->renderView();
+ if (!renderView)
+ return;
+
+ // FIXME: <rdar://problem/16642232> This call to updateScrollbars() is not actually sufficient to fix
+ // the scrollbars if the contentInset changes dynamically.
+ layout();
+ updateScrollbars(scrollOffset());
+}
+
</ins><span class="cx"> bool FrameView::hasCompositedContent() const
</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 (167629 => 167630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.h 2014-04-21 21:49:04 UTC (rev 167629)
+++ trunk/Source/WebCore/page/FrameView.h 2014-04-21 22:22:35 UTC (rev 167630)
</span><span class="lines">@@ -454,6 +454,7 @@
</span><span class="cx"> void setFooterHeight(int);
</span><span class="cx">
</span><span class="cx"> virtual float topContentInset() const override;
</span><ins>+ void topContentInsetDidChange();
</ins><span class="cx">
</span><span class="cx"> virtual void willStartLiveResize() override;
</span><span class="cx"> virtual void willEndLiveResize() override;
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (167629 => 167630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2014-04-21 21:49:04 UTC (rev 167629)
+++ trunk/Source/WebCore/page/Page.cpp 2014-04-21 22:22:35 UTC (rev 167630)
</span><span class="lines">@@ -779,8 +779,9 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_topContentInset = contentInset;
</span><del>- if (RenderView* renderView = mainFrame().contentRenderer())
- renderView->setNeedsLayout();
</del><ins>+
+ if (FrameView* view = mainFrame().view())
+ view->topContentInsetDidChange();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Page::setShouldSuppressScrollbarAnimations(bool suppressAnimations)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (167629 => 167630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-21 21:49:04 UTC (rev 167629)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-21 22:22:35 UTC (rev 167630)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-04-21 Beth Dakin <bdakin@apple.com>
+
+ topContentInset does not play well with fullscreen elements
+ https://bugs.webkit.org/show_bug.cgi?id=131955
+ -and corresponding-
+ <rdar://problem/16651925>
+
+ Reviewed by Sam Weinig.
+
+ If you take an element (such as a <video>) fullscreen when you have a
+ topContentInset set, there will be an inset-sized gap at the top of the fullscreen
+ video.
+
+ Save and restore the topContentInset whenever the scroll position is saved and
+ restored.
+ * WebProcess/FullScreen/WebFullScreenManager.cpp:
+ (WebKit::WebFullScreenManager::WebFullScreenManager):
+ (WebKit::WebFullScreenManager::saveScrollPosition):
+ (WebKit::WebFullScreenManager::restoreScrollPosition):
+ * WebProcess/FullScreen/WebFullScreenManager.h:
+
</ins><span class="cx"> 2014-04-21 Gavin Barraclough <baraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> Don't use ProcessAssertion on simulator
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessFullScreenWebFullScreenManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.cpp (167629 => 167630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.cpp 2014-04-21 21:49:04 UTC (rev 167629)
+++ trunk/Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.cpp 2014-04-21 22:22:35 UTC (rev 167630)
</span><span class="lines">@@ -65,7 +65,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebFullScreenManager::WebFullScreenManager(WebPage* page)
</span><del>- : m_page(page)
</del><ins>+ : m_topContentInset(0)
+ , m_page(page)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -156,10 +157,13 @@
</span><span class="cx"> void WebFullScreenManager::saveScrollPosition()
</span><span class="cx"> {
</span><span class="cx"> m_scrollPosition = m_page->corePage()->mainFrame().view()->scrollPosition();
</span><ins>+ m_topContentInset = m_page->corePage()->topContentInset();
+ m_page->corePage()->setTopContentInset(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebFullScreenManager::restoreScrollPosition()
</span><span class="cx"> {
</span><ins>+ m_page->corePage()->setTopContentInset(m_topContentInset);
</ins><span class="cx"> m_page->corePage()->mainFrame().view()->setScrollPosition(m_scrollPosition);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessFullScreenWebFullScreenManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.h (167629 => 167630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.h 2014-04-21 21:49:04 UTC (rev 167629)
+++ trunk/Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.h 2014-04-21 22:22:35 UTC (rev 167630)
</span><span class="lines">@@ -79,6 +79,7 @@
</span><span class="cx"> WebCore::IntRect m_initialFrame;
</span><span class="cx"> WebCore::IntRect m_finalFrame;
</span><span class="cx"> WebCore::IntPoint m_scrollPosition;
</span><ins>+ float m_topContentInset;
</ins><span class="cx"> RefPtr<WebPage> m_page;
</span><span class="cx"> RefPtr<WebCore::Element> m_element;
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>