<!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>[209782] trunk</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/209782">209782</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2016-12-13 15:37:15 -0800 (Tue, 13 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fullscreen in WebKit2 does not restore topContentInset upon exiting; leaves top of page not visible
https://bugs.webkit.org/show_bug.cgi?id=165697
Source/WebKit2:
Delegate the values of topContentInset() from WebViewImpl (used by WKWebView and WKView) to the
WebPageProxy, so that setting the topContentInset() on WebPageProxy is reflected in the getters
for the two view classes.
Reviewed by Tim Horton.
* UIProcess/Cocoa/WebViewImpl.h:
(WebKit::WebViewImpl::topContentInset): Deleted.
* UIProcess/Cocoa/WebViewImpl.mm:
(WebKit::WebViewImpl::updateContentInsetsIfAutomatic):
(WebKit::WebViewImpl::topContentInset):
(WebKit::WebViewImpl::setTopContentInset):
(WebKit::WebViewImpl::dispatchSetTopContentInset):
* UIProcess/mac/WKFullScreenWindowController.mm:
(-[WKFullScreenWindowController enterFullScreen:]):
(-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]):
(-[WKFullScreenWindowController finishedExitFullScreenAnimation:]):
(-[WKFullScreenWindowController _saveTopContentInset]): Deleted.
(-[WKFullScreenWindowController _restoreTopContentInset]): Deleted.
Tools:
Reviewed by Tim Horton.
* TestWebKitAPI/Tests/WebKit2Cocoa/FullscreenTopContentInset.mm:
(TestWebKitAPI::TEST):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebViewImplh">trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebViewImplmm">trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKFullScreenWindowControllermm">trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CocoaFullscreenTopContentInsetmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/FullscreenTopContentInset.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (209781 => 209782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-12-13 23:24:47 UTC (rev 209781)
+++ trunk/Source/WebKit2/ChangeLog 2016-12-13 23:37:15 UTC (rev 209782)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-12-13 Jer Noble <jer.noble@apple.com>
+
+ Fullscreen in WebKit2 does not restore topContentInset upon exiting; leaves top of page not visible
+ https://bugs.webkit.org/show_bug.cgi?id=165697
+
+ Delegate the values of topContentInset() from WebViewImpl (used by WKWebView and WKView) to the
+ WebPageProxy, so that setting the topContentInset() on WebPageProxy is reflected in the getters
+ for the two view classes.
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/Cocoa/WebViewImpl.h:
+ (WebKit::WebViewImpl::topContentInset): Deleted.
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (WebKit::WebViewImpl::updateContentInsetsIfAutomatic):
+ (WebKit::WebViewImpl::topContentInset):
+ (WebKit::WebViewImpl::setTopContentInset):
+ (WebKit::WebViewImpl::dispatchSetTopContentInset):
+ * UIProcess/mac/WKFullScreenWindowController.mm:
+ (-[WKFullScreenWindowController enterFullScreen:]):
+ (-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]):
+ (-[WKFullScreenWindowController finishedExitFullScreenAnimation:]):
+ (-[WKFullScreenWindowController _saveTopContentInset]): Deleted.
+ (-[WKFullScreenWindowController _restoreTopContentInset]): Deleted.
+
</ins><span class="cx"> 2016-12-13 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac][WK2] Tighten Keychain directory access
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebViewImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h (209781 => 209782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h 2016-12-13 23:24:47 UTC (rev 209781)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h 2016-12-13 23:37:15 UTC (rev 209782)
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx"> bool automaticallyAdjustsContentInsets() const { return m_automaticallyAdjustsContentInsets; }
</span><span class="cx"> void updateContentInsetsIfAutomatic();
</span><span class="cx"> void setTopContentInset(CGFloat);
</span><del>- CGFloat topContentInset() const { return m_topContentInset; }
</del><ins>+ CGFloat topContentInset() const;
</ins><span class="cx">
</span><span class="cx"> void prepareContentInRect(CGRect);
</span><span class="cx"> void updateViewExposedRect();
</span><span class="lines">@@ -606,7 +606,7 @@
</span><span class="cx"> bool m_windowOcclusionDetectionEnabled { true };
</span><span class="cx">
</span><span class="cx"> bool m_automaticallyAdjustsContentInsets { false };
</span><del>- CGFloat m_topContentInset { 0 };
</del><ins>+ CGFloat m_pendingTopContentInset { 0 };
</ins><span class="cx"> bool m_didScheduleSetTopContentInset { false };
</span><span class="cx">
</span><span class="cx"> CGSize m_resizeScrollOffset { 0, 0 };
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebViewImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (209781 => 209782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-12-13 23:24:47 UTC (rev 209781)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-12-13 23:37:15 UTC (rev 209782)
</span><span class="lines">@@ -1615,15 +1615,22 @@
</span><span class="cx"> if ((window.styleMask & NSWindowStyleMaskFullSizeContentView) && !window.titlebarAppearsTransparent && ![m_view enclosingScrollView]) {
</span><span class="cx"> NSRect contentLayoutRect = [m_view convertRect:window.contentLayoutRect fromView:nil];
</span><span class="cx"> CGFloat newTopContentInset = NSMaxY(contentLayoutRect) - NSHeight(contentLayoutRect);
</span><del>- if (m_topContentInset != newTopContentInset)
</del><ins>+ if (m_page->topContentInset() != newTopContentInset)
</ins><span class="cx"> setTopContentInset(newTopContentInset);
</span><span class="cx"> } else
</span><span class="cx"> setTopContentInset(0);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+CGFloat WebViewImpl::topContentInset() const
+{
+ if (m_didScheduleSetTopContentInset)
+ return m_pendingTopContentInset;
+ return m_page->topContentInset();
+}
+
</ins><span class="cx"> void WebViewImpl::setTopContentInset(CGFloat contentInset)
</span><span class="cx"> {
</span><del>- m_topContentInset = contentInset;
</del><ins>+ m_pendingTopContentInset = contentInset;
</ins><span class="cx">
</span><span class="cx"> if (m_didScheduleSetTopContentInset)
</span><span class="cx"> return;
</span><span class="lines">@@ -1644,7 +1651,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_didScheduleSetTopContentInset = false;
</span><del>- m_page->setTopContentInset(m_topContentInset);
</del><ins>+ m_page->setTopContentInset(m_pendingTopContentInset);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebViewImpl::prepareContentInRect(CGRect rect)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKFullScreenWindowControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm (209781 => 209782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm 2016-12-13 23:24:47 UTC (rev 209781)
+++ trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm 2016-12-13 23:37:15 UTC (rev 209782)
</span><span class="lines">@@ -415,6 +415,7 @@
</span><span class="cx"> [self _manager]->setAnimatingFullScreen(false);
</span><span class="cx"> _page->scalePage(_savedScale, IntPoint());
</span><span class="cx"> [self _manager]->restoreScrollPosition();
</span><ins>+ _page->setTopContentInset(_savedTopContentInset);
</ins><span class="cx">
</span><span class="cx"> if (_repaintCallback) {
</span><span class="cx"> _repaintCallback->invalidate(WebKit::CallbackBase::Error::OwnerWasInvalidated);
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (209781 => 209782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-12-13 23:24:47 UTC (rev 209781)
+++ trunk/Tools/ChangeLog 2016-12-13 23:37:15 UTC (rev 209782)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-12-13 Jer Noble <jer.noble@apple.com>
+
+ Fullscreen in WebKit2 does not restore topContentInset upon exiting; leaves top of page not visible
+ https://bugs.webkit.org/show_bug.cgi?id=165697
+
+ Reviewed by Tim Horton.
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/FullscreenTopContentInset.mm:
+ (TestWebKitAPI::TEST):
+
</ins><span class="cx"> 2016-12-13 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] Implement -shouldInsertText: on WKWebProcessPlugInEditingDelegate
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaFullscreenTopContentInsetmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/FullscreenTopContentInset.mm (209781 => 209782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/FullscreenTopContentInset.mm 2016-12-13 23:24:47 UTC (rev 209781)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/FullscreenTopContentInset.mm 2016-12-13 23:37:15 UTC (rev 209782)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx"> RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
</span><span class="cx"> RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100) configuration:configuration.get()]);
</span><span class="cx"> [webView _setTopContentInset:10];
</span><ins>+ [webView _setAutomaticallyAdjustsContentInsets:NO];
</ins><span class="cx"> [configuration preferences]._fullScreenEnabled = YES;
</span><span class="cx"> RetainPtr<FullscreenChangeMessageHandler> handler = adoptNS([[FullscreenChangeMessageHandler alloc] init]);
</span><span class="cx"> [[configuration userContentController] addScriptMessageHandler:handler.get() name:@"fullscreenChangeHandler"];
</span><span class="lines">@@ -75,6 +76,11 @@
</span><span class="cx"> TestWebKitAPI::Util::run(&receivedFullscreenChangeMessage);
</span><span class="cx"> ASSERT_EQ(window.get().screen.frame.size.width, webView.get().frame.size.width);
</span><span class="cx"> ASSERT_EQ(window.get().screen.frame.size.height + webView.get()._topContentInset, webView.get().frame.size.height);
</span><ins>+
+ receivedFullscreenChangeMessage = false;
+ [webView mouseDown:event];
+ TestWebKitAPI::Util::run(&receivedFullscreenChangeMessage);
+ ASSERT_EQ(10, webView.get()._topContentInset);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace TestWebKitAPI
</span></span></pre>
</div>
</div>
</body>
</html>