<!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>[202763] trunk/Source/WebKit2</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/202763">202763</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2016-07-01 16:41:45 -0700 (Fri, 01 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/201405">r201405</a>): Fullscreen video no longer enters low-power mode
https://bugs.webkit.org/show_bug.cgi?id=159220
<rdar://problem/26701056>
Reviewed by Beth Dakin.
In <a href="http://trac.webkit.org/projects/webkit/changeset/201405">r201405</a>, we removed the call to setTopContentInset(0) to avoid a flash
during repainting where the WebProcess still thought it had an inset and
the UIProcess did not, but the >0 inset breaks low power video playback
in fullscreen. So, instead, fix the repaint issue by setting a CALayer
fence which makes sure both the UIProcess and WebProcess paint simultaneously
after resizing and changing the top content inset.
This requires a new message from WebPageProxy -> WebPage: setTopContentInsetFenced().
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::setTopContentInset):
* UIProcess/mac/WKFullScreenWindowController.h:
* UIProcess/mac/WKFullScreenWindowController.mm:
(-[WKFullScreenWindowController enterFullScreen:]):
(-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::setTopContentInsetFenced):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKFullScreenWindowControllerh">trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKFullScreenWindowControllermm">trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagemessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (202762 => 202763)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-07-01 23:25:04 UTC (rev 202762)
+++ trunk/Source/WebKit2/ChangeLog 2016-07-01 23:41:45 UTC (rev 202763)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2016-07-01 Jer Noble <jer.noble@apple.com>
+
+ REGRESSION(r201405): Fullscreen video no longer enters low-power mode
+ https://bugs.webkit.org/show_bug.cgi?id=159220
+ <rdar://problem/26701056>
+
+ Reviewed by Beth Dakin.
+
+ In r201405, we removed the call to setTopContentInset(0) to avoid a flash
+ during repainting where the WebProcess still thought it had an inset and
+ the UIProcess did not, but the >0 inset breaks low power video playback
+ in fullscreen. So, instead, fix the repaint issue by setting a CALayer
+ fence which makes sure both the UIProcess and WebProcess paint simultaneously
+ after resizing and changing the top content inset.
+
+ This requires a new message from WebPageProxy -> WebPage: setTopContentInsetFenced().
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::setTopContentInset):
+ * UIProcess/mac/WKFullScreenWindowController.h:
+ * UIProcess/mac/WKFullScreenWindowController.mm:
+ (-[WKFullScreenWindowController enterFullScreen:]):
+ (-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::setTopContentInsetFenced):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+
</ins><span class="cx"> 2016-07-01 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Get rid of support for old SDKs
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (202762 => 202763)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-07-01 23:25:04 UTC (rev 202762)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-07-01 23:41:45 UTC (rev 202763)
</span><span class="lines">@@ -1315,8 +1315,16 @@
</span><span class="cx">
</span><span class="cx"> m_topContentInset = contentInset;
</span><span class="cx">
</span><del>- if (isValid())
- m_process->send(Messages::WebPage::SetTopContentInset(contentInset), m_pageID);
</del><ins>+ if (!isValid())
+ return;
+#if PLATFORM(COCOA)
+ MachSendRight fence = m_drawingArea->createFence();
+
+ auto fenceAttachment = IPC::Attachment(fence.leakSendRight(), MACH_MSG_TYPE_MOVE_SEND);
+ m_process->send(Messages::WebPage::SetTopContentInsetFenced(contentInset, fenceAttachment), m_pageID);
+#else
+ m_process->send(Messages::WebPage::SetTopContentInset(contentInset), m_pageID);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::setUnderlayColor(const Color& color)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKFullScreenWindowControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.h (202762 => 202763)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.h 2016-07-01 23:25:04 UTC (rev 202762)
+++ trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.h 2016-07-01 23:41:45 UTC (rev 202763)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx">
</span><span class="cx"> double _savedScale;
</span><span class="cx"> RefPtr<WebKit::VoidCallback> _repaintCallback;
</span><ins>+ float _savedTopContentInset;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @property (readonly) NSRect initialFrame;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKFullScreenWindowControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm (202762 => 202763)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm 2016-07-01 23:25:04 UTC (rev 202762)
+++ trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm 2016-07-01 23:41:45 UTC (rev 202763)
</span><span class="lines">@@ -220,6 +220,8 @@
</span><span class="cx">
</span><span class="cx"> NSResponder *webWindowFirstResponder = [[_webView window] firstResponder];
</span><span class="cx"> [self _manager]->saveScrollPosition();
</span><ins>+ _savedTopContentInset = _page->topContentInset();
+ _page->setTopContentInset(0);
</ins><span class="cx"> [[self window] setFrame:screenFrame display:NO];
</span><span class="cx">
</span><span class="cx"> // Painting is normally suspended when the WKView is removed from the window, but this is
</span><span class="lines">@@ -240,9 +242,7 @@
</span><span class="cx"> // Then insert the WebView into the full screen window
</span><span class="cx"> NSView *contentView = [[self window] contentView];
</span><span class="cx"> [_clipView addSubview:_webView positioned:NSWindowBelow relativeTo:nil];
</span><del>- NSRect contentViewBounds = contentView.bounds;
- contentViewBounds.size.height += _page->topContentInset();
- _webView.frame = contentViewBounds;
</del><ins>+ _webView.frame = NSInsetRect(contentView.bounds, 0, -_page->topContentInset());
</ins><span class="cx">
</span><span class="cx"> makeResponderFirstResponderIfDescendantOfView(self.window, webWindowFirstResponder, _webView);
</span><span class="cx">
</span><span class="lines">@@ -304,6 +304,7 @@
</span><span class="cx">
</span><span class="cx"> _page->scalePage(_savedScale, IntPoint());
</span><span class="cx"> [self _manager]->restoreScrollPosition();
</span><ins>+ _page->setTopContentInset(_savedTopContentInset);
</ins><span class="cx"> [self _manager]->didExitFullScreen();
</span><span class="cx"> [self _manager]->setAnimatingFullScreen(false);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (202762 => 202763)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-07-01 23:25:04 UTC (rev 202762)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-07-01 23:41:45 UTC (rev 202763)
</span><span class="lines">@@ -2457,6 +2457,17 @@
</span><span class="cx"> m_drawingArea->setNeedsDisplay();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
+void WebPage::setTopContentInsetFenced(float contentInset, IPC::Attachment fencePort)
+{
+ m_drawingArea->addFence(MachSendRight::create(fencePort.port()));
+
+ setTopContentInset(contentInset);
+
+ mach_port_deallocate(mach_task_self(), fencePort.port());
+}
+#endif
+
</ins><span class="cx"> void WebPage::setTopContentInset(float contentInset)
</span><span class="cx"> {
</span><span class="cx"> if (contentInset == m_page->topContentInset())
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (202762 => 202763)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-07-01 23:25:04 UTC (rev 202762)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-07-01 23:41:45 UTC (rev 202763)
</span><span class="lines">@@ -1053,6 +1053,9 @@
</span><span class="cx">
</span><span class="cx"> void setDrawsBackground(bool);
</span><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
+ void setTopContentInsetFenced(float, IPC::Attachment);
+#endif
</ins><span class="cx"> void setTopContentInset(float);
</span><span class="cx">
</span><span class="cx"> void viewWillStartLiveResize();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (202762 => 202763)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2016-07-01 23:25:04 UTC (rev 202762)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2016-07-01 23:41:45 UTC (rev 202763)
</span><span class="lines">@@ -29,6 +29,9 @@
</span><span class="cx">
</span><span class="cx"> SetDrawsBackground(bool drawsBackground)
</span><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
+ SetTopContentInsetFenced(float contentInset, IPC::Attachment fencePort)
+#endif
</ins><span class="cx"> SetTopContentInset(float contentInset)
</span><span class="cx">
</span><span class="cx"> SetUnderlayColor(WebCore::Color color)
</span></span></pre>
</div>
</div>
</body>
</html>