<!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>[189081] 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/189081">189081</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-08-27 19:11:36 -0700 (Thu, 27 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Video full-screen shouldn't use the DynamicSizeWithMinimumViewSize layout mode
https://bugs.webkit.org/show_bug.cgi?id=148553
Reviewed by Zalan Bujtas.
* UIProcess/API/mac/WKView.mm:
(-[WKView _supportsArbitraryLayoutModes]):
(-[WKView _updateSupportsArbitraryLayoutModes]):
(-[WKView _didCommitLoadForMainFrame]):
* UIProcess/API/mac/WKViewInternal.h:
* UIProcess/mac/PageClientImpl.mm:
(WebKit::PageClientImpl::beganEnterFullScreen):
(WebKit::PageClientImpl::beganExitFullScreen):
* UIProcess/mac/WKFullScreenWindowController.mm:
(-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]): Deleted.
(-[WKFullScreenWindowController finishedExitFullScreenAnimation:]): Deleted.
It's not OK to just randomly change the layout mode, because the client
can change it or its properties out from under us, and also because we
weren't resetting it to whatever the client had specified.
I recently implemented a better way to override layout modes, for PDF,
so use that here. Also, we shouldn't use DynamicSizeWithMinimumViewSize,
we should just use the "normal" mode (ViewSize), since we've already ensured
a minimum size by setting contentMinSize.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKViewmm">trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKViewInternalh">trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacPageClientImplmm">trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKFullScreenWindowControllermm">trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (189080 => 189081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-08-28 01:43:14 UTC (rev 189080)
+++ trunk/Source/WebKit2/ChangeLog 2015-08-28 02:11:36 UTC (rev 189081)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-08-27 Timothy Horton <timothy_horton@apple.com>
+
+ Video full-screen shouldn't use the DynamicSizeWithMinimumViewSize layout mode
+ https://bugs.webkit.org/show_bug.cgi?id=148553
+
+ Reviewed by Zalan Bujtas.
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _supportsArbitraryLayoutModes]):
+ (-[WKView _updateSupportsArbitraryLayoutModes]):
+ (-[WKView _didCommitLoadForMainFrame]):
+ * UIProcess/API/mac/WKViewInternal.h:
+ * UIProcess/mac/PageClientImpl.mm:
+ (WebKit::PageClientImpl::beganEnterFullScreen):
+ (WebKit::PageClientImpl::beganExitFullScreen):
+ * UIProcess/mac/WKFullScreenWindowController.mm:
+ (-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]): Deleted.
+ (-[WKFullScreenWindowController finishedExitFullScreenAnimation:]): Deleted.
+ It's not OK to just randomly change the layout mode, because the client
+ can change it or its properties out from under us, and also because we
+ weren't resetting it to whatever the client had specified.
+
+ I recently implemented a better way to override layout modes, for PDF,
+ so use that here. Also, we shouldn't use DynamicSizeWithMinimumViewSize,
+ we should just use the "normal" mode (ViewSize), since we've already ensured
+ a minimum size by setting contentMinSize.
+
</ins><span class="cx"> 2015-08-27 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> pluginInfo.clientLoadPolicy is used uninitialized in WebContent process
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (189080 => 189081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-08-28 01:43:14 UTC (rev 189080)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-08-28 02:11:36 UTC (rev 189081)
</span><span class="lines">@@ -3901,6 +3901,9 @@
</span><span class="cx">
</span><span class="cx"> - (BOOL)_supportsArbitraryLayoutModes
</span><span class="cx"> {
</span><ins>+ if ([_data->_fullScreenWindowController isFullScreen])
+ return NO;
+
</ins><span class="cx"> WebPageProxy* page = _data->_page.get();
</span><span class="cx"> if (!page)
</span><span class="cx"> return YES;
</span><span class="lines">@@ -3916,7 +3919,7 @@
</span><span class="cx"> return YES;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_didCommitLoadForMainFrame
</del><ins>+- (void)_updateSupportsArbitraryLayoutModes
</ins><span class="cx"> {
</span><span class="cx"> if (![self _supportsArbitraryLayoutModes]) {
</span><span class="cx"> WKLayoutMode oldRequestedLayoutMode = _data->_lastRequestedLayoutMode;
</span><span class="lines">@@ -3934,6 +3937,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)_didCommitLoadForMainFrame
+{
+ [self _updateSupportsArbitraryLayoutModes];
+}
+
</ins><span class="cx"> - (void)_didFinishLoadForMainFrame
</span><span class="cx"> {
</span><span class="cx"> if (_data->_gestureController)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h (189080 => 189081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2015-08-28 01:43:14 UTC (rev 189080)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2015-08-28 02:11:36 UTC (rev 189081)
</span><span class="lines">@@ -161,4 +161,6 @@
</span><span class="cx"> - (void)_updateViewExposedRect;
</span><span class="cx"> - (CALayer *)_rootLayer;
</span><span class="cx">
</span><ins>+- (void)_updateSupportsArbitraryLayoutModes;
+
</ins><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacPageClientImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm (189080 => 189081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-08-28 01:43:14 UTC (rev 189080)
+++ trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-08-28 02:11:36 UTC (rev 189081)
</span><span class="lines">@@ -708,11 +708,13 @@
</span><span class="cx"> void PageClientImpl::beganEnterFullScreen(const IntRect& initialFrame, const IntRect& finalFrame)
</span><span class="cx"> {
</span><span class="cx"> [m_wkView._fullScreenWindowController beganEnterFullScreenWithInitialFrame:initialFrame finalFrame:finalFrame];
</span><ins>+ [m_wkView _updateSupportsArbitraryLayoutModes];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageClientImpl::beganExitFullScreen(const IntRect& initialFrame, const IntRect& finalFrame)
</span><span class="cx"> {
</span><span class="cx"> [m_wkView._fullScreenWindowController beganExitFullScreenWithInitialFrame:initialFrame finalFrame:finalFrame];
</span><ins>+ [m_wkView _updateSupportsArbitraryLayoutModes];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(FULLSCREEN_API)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKFullScreenWindowControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm (189080 => 189081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm 2015-08-28 01:43:14 UTC (rev 189080)
+++ trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm 2015-08-28 02:11:36 UTC (rev 189081)
</span><span class="lines">@@ -301,8 +301,6 @@
</span><span class="cx"> [_webViewPlaceholder setExitWarningVisible:YES];
</span><span class="cx"> [_webViewPlaceholder setTarget:self];
</span><span class="cx">
</span><del>- [_webView _setLayoutMode:kWKLayoutModeDynamicSizeWithMinimumViewSize];
-
</del><span class="cx"> NSSize minContentSize = self.window.contentMinSize;
</span><span class="cx"> minContentSize.width = minVideoWidth;
</span><span class="cx"> self.window.contentMinSize = minContentSize;
</span><span class="lines">@@ -392,7 +390,6 @@
</span><span class="cx"> makeResponderFirstResponderIfDescendantOfView(_webView.window, firstResponder, _webView);
</span><span class="cx">
</span><span class="cx"> [[_webView window] makeKeyAndOrderFront:self];
</span><del>- [_webView _setLayoutMode:kWKLayoutModeViewSize];
</del><span class="cx">
</span><span class="cx"> // These messages must be sent after the swap or flashing will occur during forceRepaint:
</span><span class="cx"> [self _manager]->didExitFullScreen();
</span></span></pre>
</div>
</div>
</body>
</html>