<!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>[169295] 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/169295">169295</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-23 17:23:15 -0700 (Fri, 23 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Hide fullscreen immediately when switching tabs.
https://bugs.webkit.org/show_bug.cgi?id=133239
Patch by Jeremy Jones <jeremyj@apple.com> on 2014-05-23
Reviewed by Eric Carlson.
Source/WebCore:
This change allows fullscreen to disappear immediately while still cleaning
up fullscreen normally.
* WebCore.exp.in:
* platform/ios/WebVideoFullscreenControllerAVKit.h:
renamed function to requestHideAndExitFullscreen
* platform/ios/WebVideoFullscreenControllerAVKit.mm:
renamed function to requestHideAndExitFullscreen
(-[WebVideoFullscreenController requestHideAndExitFullscreen]):
rename of requestExitFullscreen that also hides.
(-[WebVideoFullscreenController requestExitFullscreen]): Deleted.
* platform/ios/WebVideoFullscreenInterfaceAVKit.h: declare requestHideAndExitFullscreen()
* platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
(WebVideoFullscreenInterfaceAVKit::requestHideAndExitFullscreen):
this hides the window before requesting exitfullscreen from the model.
Source/WebKit/mac:
Renamed a function to better describe it's new functionality.
* WebView/WebView.mm:
(-[WebView viewDidMoveToWindow]):
now calls: requestHideAndExitFullscreen
Source/WebKit2:
Renamed a function to better describe it's new functionality.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::viewStateDidChange):
now calls: requestHideAndExitFullscreen</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebVideoFullscreenControllerAVKith">trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.h</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebVideoFullscreenControllerAVKitmm">trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKith">trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm">trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169294 => 169295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-24 00:18:32 UTC (rev 169294)
+++ trunk/Source/WebCore/ChangeLog 2014-05-24 00:23:15 UTC (rev 169295)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-05-23 Jeremy Jones <jeremyj@apple.com>
+
+ Hide fullscreen immediately when switching tabs.
+ https://bugs.webkit.org/show_bug.cgi?id=133239
+
+ Reviewed by Eric Carlson.
+
+ This change allows fullscreen to disappear immediately while still cleaning
+ up fullscreen normally.
+
+ * WebCore.exp.in:
+ * platform/ios/WebVideoFullscreenControllerAVKit.h:
+ renamed function to requestHideAndExitFullscreen
+
+ * platform/ios/WebVideoFullscreenControllerAVKit.mm:
+ renamed function to requestHideAndExitFullscreen
+
+ (-[WebVideoFullscreenController requestHideAndExitFullscreen]):
+ rename of requestExitFullscreen that also hides.
+
+ (-[WebVideoFullscreenController requestExitFullscreen]): Deleted.
+ * platform/ios/WebVideoFullscreenInterfaceAVKit.h: declare requestHideAndExitFullscreen()
+ * platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+ (WebVideoFullscreenInterfaceAVKit::requestHideAndExitFullscreen):
+ this hides the window before requesting exitfullscreen from the model.
+
</ins><span class="cx"> 2014-05-23 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] WKPDFView should have a page indicator
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (169294 => 169295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-05-24 00:18:32 UTC (rev 169294)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-05-24 00:23:15 UTC (rev 169295)
</span><span class="lines">@@ -3385,6 +3385,7 @@
</span><span class="cx"> __ZN7WebCore32WebVideoFullscreenInterfaceAVKit17setSeekableRangesERKNS_10TimeRangesE
</span><span class="cx"> __ZN7WebCore32WebVideoFullscreenInterfaceAVKit18setVideoDimensionsEbff
</span><span class="cx"> __ZN7WebCore32WebVideoFullscreenInterfaceAVKit26setWebVideoFullscreenModelEPNS_23WebVideoFullscreenModelE
</span><ins>+__ZN7WebCore32WebVideoFullscreenInterfaceAVKit28requestHideAndExitFullscreenEv
</ins><span class="cx"> __ZN7WebCore32WebVideoFullscreenInterfaceAVKit29setAudioMediaSelectionOptionsERKN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEEy
</span><span class="cx"> __ZN7WebCore32WebVideoFullscreenInterfaceAVKit31setLegibleMediaSelectionOptionsERKN3WTF6VectorINS1_6StringELm0ENS1_15CrashOnOverflowEEEy
</span><span class="cx"> __ZN7WebCore32WebVideoFullscreenInterfaceAVKit35setWebVideoFullscreenChangeObserverEPNS_32WebVideoFullscreenChangeObserverE
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenControllerAVKith"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.h (169294 => 169295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.h 2014-05-24 00:18:32 UTC (rev 169294)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.h 2014-05-24 00:23:15 UTC (rev 169295)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> - (WebCore::HTMLMediaElement*)mediaElement;
</span><span class="cx"> - (void)enterFullscreen:(UIScreen *)screen;
</span><span class="cx"> - (void)exitFullscreen;
</span><del>-- (void)requestExitFullscreen;
</del><ins>+- (void)requestHideAndExitFullscreen;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenControllerAVKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm (169294 => 169295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2014-05-24 00:18:32 UTC (rev 169294)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2014-05-24 00:23:15 UTC (rev 169295)
</span><span class="lines">@@ -131,10 +131,10 @@
</span><span class="cx"> _interface->exitFullscreen(_mediaElement->screenRect());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)requestExitFullscreen
</del><ins>+- (void)requestHideAndExitFullscreen
</ins><span class="cx"> {
</span><del>- if (_model)
- _model->requestExitFullscreen();
</del><ins>+ if (_interface)
+ _interface->requestHideAndExitFullscreen();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)didEnterFullscreen
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKith"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h (169294 => 169295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h 2014-05-24 00:18:32 UTC (rev 169294)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h 2014-05-24 00:23:15 UTC (rev 169295)
</span><span class="lines">@@ -87,6 +87,7 @@
</span><span class="cx"> virtual void enterFullscreen(PlatformLayer&, WebCore::IntRect initialRect);
</span><span class="cx"> virtual void exitFullscreen(WebCore::IntRect finalRect);
</span><span class="cx"> virtual void invalidate();
</span><ins>+ virtual void requestHideAndExitFullscreen();
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (169294 => 169295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2014-05-24 00:18:32 UTC (rev 169294)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2014-05-24 00:23:15 UTC (rev 169295)
</span><span class="lines">@@ -760,4 +760,12 @@
</span><span class="cx"> m_videoLayerContainer = nil;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebVideoFullscreenInterfaceAVKit::requestHideAndExitFullscreen()
+{
+ [m_window setHidden:YES];
+ if (m_videoFullscreenModel)
+ m_videoFullscreenModel->requestExitFullscreen();
+}
+
+
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (169294 => 169295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-05-24 00:18:32 UTC (rev 169294)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-05-24 00:23:15 UTC (rev 169295)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-05-23 Jeremy Jones <jeremyj@apple.com>
+
+ Hide fullscreen immediately when switching tabs.
+ https://bugs.webkit.org/show_bug.cgi?id=133239
+
+ Reviewed by Eric Carlson.
+
+ Renamed a function to better describe it's new functionality.
+
+ * WebView/WebView.mm:
+ (-[WebView viewDidMoveToWindow]):
+ now calls: requestHideAndExitFullscreen
+
</ins><span class="cx"> 2014-05-20 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Allow popup menus to override default appearance
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (169294 => 169295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-05-24 00:18:32 UTC (rev 169294)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-05-24 00:23:15 UTC (rev 169295)
</span><span class="lines">@@ -5280,7 +5280,7 @@
</span><span class="cx"> }
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> else
</span><del>- [_private->fullscreenController requestExitFullscreen];
</del><ins>+ [_private->fullscreenController requestHideAndExitFullscreen];
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (169294 => 169295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-24 00:18:32 UTC (rev 169294)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-24 00:23:15 UTC (rev 169295)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-05-23 Jeremy Jones <jeremyj@apple.com>
+
+ Hide fullscreen immediately when switching tabs.
+ https://bugs.webkit.org/show_bug.cgi?id=133239
+
+ Reviewed by Eric Carlson.
+
+ Renamed a function to better describe it's new functionality.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::viewStateDidChange):
+ now calls: requestHideAndExitFullscreen
+
</ins><span class="cx"> 2014-05-23 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (WebKit2): Keyboard disappears/appears automatically between text boxes.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (169294 => 169295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-05-24 00:18:32 UTC (rev 169294)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-05-24 00:23:15 UTC (rev 169295)
</span><span class="lines">@@ -1118,7 +1118,7 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> // When leaving the current page, close the video fullscreen.
</span><span class="cx"> if (m_videoFullscreenManager)
</span><del>- m_videoFullscreenManager->requestExitFullscreen();
</del><ins>+ m_videoFullscreenManager->requestHideAndExitFullscreen();
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>