<!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>[168439] 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/168439">168439</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-07 14:19:03 -0700 (Wed, 07 May 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>HTMLMediaElement should exitFullscreen when view is removed from the window.
https://bugs.webkit.org/show_bug.cgi?id=132506

Patch by Jeremy Jones &lt;jeremyj@apple.com&gt; on 2014-05-07
Reviewed by Tim Horton.

Source/WebCore:
* platform/ios/WebVideoFullscreenControllerAVKit.h:
Add -requestExitFullscreen.

* platform/ios/WebVideoFullscreenControllerAVKit.mm:
(-[WebVideoFullscreenController requestExitFullscreen]):
Forward request onto WebVideoFullscreenModelMediaElement.

* platform/ios/WebVideoFullscreenModelMediaElement.mm:
(WebVideoFullscreenModelMediaElement::requestExitFullscreen):
Add some protection here since this may be called when not in fullscreen.

Source/WebKit/mac:
* WebView/WebView.mm:
(-[WebView viewDidMoveToWindow]):
Request WebVideoFullscreenController to exitFullscreen when view is removed from the window.

Source/WebKit2:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::viewStateDidChange):
Request WebVideoFUllscreenManagerProxy to exitFullscreen when removed from the window.
* UIProcess/ios/WebVideoFullscreenManagerProxy.h:
Make requestExitFullscreen() public instead of private.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebCoreplatformiosWebVideoFullscreenModelMediaElementmm">trunk/Source/WebCore/platform/ios/WebVideoFullscreenModelMediaElement.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>
<li><a href="#trunkSourceWebKit2UIProcessiosWebVideoFullscreenManagerProxyh">trunk/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168438 => 168439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-05-07 21:17:53 UTC (rev 168438)
+++ trunk/Source/WebCore/ChangeLog        2014-05-07 21:19:03 UTC (rev 168439)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-05-07  Jeremy Jones  &lt;jeremyj@apple.com&gt;
+
+        HTMLMediaElement should exitFullscreen when view is removed from the window.
+        https://bugs.webkit.org/show_bug.cgi?id=132506
+
+        Reviewed by Tim Horton.
+
+        * platform/ios/WebVideoFullscreenControllerAVKit.h:
+        Add -requestExitFullscreen.
+
+        * platform/ios/WebVideoFullscreenControllerAVKit.mm:
+        (-[WebVideoFullscreenController requestExitFullscreen]):
+        Forward request onto WebVideoFullscreenModelMediaElement.
+
+        * platform/ios/WebVideoFullscreenModelMediaElement.mm:
+        (WebVideoFullscreenModelMediaElement::requestExitFullscreen):
+        Add some protection here since this may be called when not in fullscreen.
+
</ins><span class="cx"> 2014-05-07  Dean Jackson  &lt;dino@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Clean up the difference between painting focus rings and adding PDF annotations
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenControllerAVKith"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.h (168438 => 168439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.h        2014-05-07 21:17:53 UTC (rev 168438)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.h        2014-05-07 21:19:03 UTC (rev 168439)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> - (WebCore::HTMLMediaElement*)mediaElement;
</span><span class="cx"> - (void)enterFullscreen:(UIScreen *)screen;
</span><span class="cx"> - (void)exitFullscreen;
</span><ins>+- (void)requestExitFullscreen;
</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 (168438 => 168439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm        2014-05-07 21:17:53 UTC (rev 168438)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm        2014-05-07 21:19:03 UTC (rev 168439)
</span><span class="lines">@@ -131,6 +131,12 @@
</span><span class="cx">     _interface-&gt;exitFullscreen(_mediaElement-&gt;screenRect());
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+- (void)requestExitFullscreen
+{
+    if (_model)
+        _model-&gt;requestExitFullscreen();
+}
+
</ins><span class="cx"> - (void)didEnterFullscreen
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenModelMediaElementmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenModelMediaElement.mm (168438 => 168439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenModelMediaElement.mm        2014-05-07 21:17:53 UTC (rev 168438)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenModelMediaElement.mm        2014-05-07 21:19:03 UTC (rev 168439)
</span><span class="lines">@@ -135,7 +135,8 @@
</span><span class="cx">     
</span><span class="cx">     __block RefPtr&lt;WebVideoFullscreenModelMediaElement&gt; protect(this);
</span><span class="cx">     WebThreadRun(^{
</span><del>-        m_mediaElement-&gt;setVideoFullscreenLayer(m_videoFullscreenLayer.get());
</del><ins>+        if (m_mediaElement)
+            m_mediaElement-&gt;setVideoFullscreenLayer(m_videoFullscreenLayer.get());
</ins><span class="cx">         protect.clear();
</span><span class="cx">     });
</span><span class="cx"> }
</span><span class="lines">@@ -143,7 +144,8 @@
</span><span class="cx"> void WebVideoFullscreenModelMediaElement::play() {
</span><span class="cx">     __block RefPtr&lt;WebVideoFullscreenModelMediaElement&gt; protect(this);
</span><span class="cx">     WebThreadRun(^{
</span><del>-        m_mediaElement-&gt;play();
</del><ins>+        if (m_mediaElement)
+            m_mediaElement-&gt;play();
</ins><span class="cx">         protect.clear();
</span><span class="cx">     });
</span><span class="cx"> }
</span><span class="lines">@@ -152,7 +154,8 @@
</span><span class="cx"> {
</span><span class="cx">     __block RefPtr&lt;WebVideoFullscreenModelMediaElement&gt; protect(this);
</span><span class="cx">     WebThreadRun(^{
</span><del>-        m_mediaElement-&gt;pause();
</del><ins>+        if (m_mediaElement)
+            m_mediaElement-&gt;pause();
</ins><span class="cx">         protect.clear();
</span><span class="cx">     });
</span><span class="cx"> }
</span><span class="lines">@@ -161,7 +164,8 @@
</span><span class="cx"> {
</span><span class="cx">     __block RefPtr&lt;WebVideoFullscreenModelMediaElement&gt; protect(this);
</span><span class="cx">     WebThreadRun(^{
</span><del>-        m_mediaElement-&gt;togglePlayState();
</del><ins>+        if (m_mediaElement)
+            m_mediaElement-&gt;togglePlayState();
</ins><span class="cx">         protect.clear();
</span><span class="cx">     });
</span><span class="cx"> }
</span><span class="lines">@@ -170,7 +174,8 @@
</span><span class="cx"> {
</span><span class="cx">     __block RefPtr&lt;WebVideoFullscreenModelMediaElement&gt; protect(this);
</span><span class="cx">     WebThreadRun(^{
</span><del>-        m_mediaElement-&gt;beginScrubbing();
</del><ins>+        if (m_mediaElement)
+            m_mediaElement-&gt;beginScrubbing();
</ins><span class="cx">         protect.clear();
</span><span class="cx">     });
</span><span class="cx"> }
</span><span class="lines">@@ -179,7 +184,8 @@
</span><span class="cx"> {
</span><span class="cx">     __block RefPtr&lt;WebVideoFullscreenModelMediaElement&gt; protect(this);
</span><span class="cx">     WebThreadRun(^{
</span><del>-        m_mediaElement-&gt;endScrubbing();
</del><ins>+        if (m_mediaElement)
+            m_mediaElement-&gt;endScrubbing();
</ins><span class="cx">         protect.clear();
</span><span class="cx">     });
</span><span class="cx"> }
</span><span class="lines">@@ -188,7 +194,8 @@
</span><span class="cx"> {
</span><span class="cx">     __block RefPtr&lt;WebVideoFullscreenModelMediaElement&gt; protect(this);
</span><span class="cx">     WebThreadRun(^{
</span><del>-        m_mediaElement-&gt;setCurrentTime(time);
</del><ins>+        if (m_mediaElement)
+            m_mediaElement-&gt;setCurrentTime(time);
</ins><span class="cx">         protect.clear();
</span><span class="cx">     });
</span><span class="cx"> }
</span><span class="lines">@@ -197,7 +204,8 @@
</span><span class="cx"> {
</span><span class="cx">     __block RefPtr&lt;WebVideoFullscreenModelMediaElement&gt; protect(this);
</span><span class="cx">     WebThreadRun(^{
</span><del>-        m_mediaElement-&gt;fastSeek(time);
</del><ins>+        if (m_mediaElement)
+            m_mediaElement-&gt;fastSeek(time);
</ins><span class="cx">         protect.clear();
</span><span class="cx">     });
</span><span class="cx"> }
</span><span class="lines">@@ -206,7 +214,8 @@
</span><span class="cx"> {
</span><span class="cx">     __block RefPtr&lt;WebVideoFullscreenModelMediaElement&gt; protect(this);
</span><span class="cx">     WebThreadRun(^{
</span><del>-        m_mediaElement-&gt;beginScanning(MediaControllerInterface::Forward);
</del><ins>+        if (m_mediaElement)
+            m_mediaElement-&gt;beginScanning(MediaControllerInterface::Forward);
</ins><span class="cx">         protect.clear();
</span><span class="cx">     });
</span><span class="cx"> }
</span><span class="lines">@@ -215,7 +224,8 @@
</span><span class="cx"> {
</span><span class="cx">     __block RefPtr&lt;WebVideoFullscreenModelMediaElement&gt; protect(this);
</span><span class="cx">     WebThreadRun(^{
</span><del>-        m_mediaElement-&gt;beginScanning(MediaControllerInterface::Backward);
</del><ins>+        if (m_mediaElement)
+            m_mediaElement-&gt;beginScanning(MediaControllerInterface::Backward);
</ins><span class="cx">         protect.clear();
</span><span class="cx">     });
</span><span class="cx"> }
</span><span class="lines">@@ -224,16 +234,20 @@
</span><span class="cx"> {
</span><span class="cx">     __block RefPtr&lt;WebVideoFullscreenModelMediaElement&gt; protect(this);
</span><span class="cx">     WebThreadRun(^{
</span><del>-        m_mediaElement-&gt;endScanning();
</del><ins>+        if (m_mediaElement)
+            m_mediaElement-&gt;endScanning();
</ins><span class="cx">         protect.clear();
</span><span class="cx">     });
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void WebVideoFullscreenModelMediaElement::requestExitFullscreen()
</span><span class="cx"> {
</span><ins>+    if (!m_mediaElement)
+        return;
+
</ins><span class="cx">     __block RefPtr&lt;WebVideoFullscreenModelMediaElement&gt; protect(this);
</span><span class="cx">     WebThreadRun(^{
</span><del>-        if (m_mediaElement-&gt;isFullscreen())
</del><ins>+        if (m_mediaElement &amp;&amp; m_mediaElement-&gt;isFullscreen())
</ins><span class="cx">             m_mediaElement-&gt;exitFullscreen();
</span><span class="cx">         protect.clear();
</span><span class="cx">     });
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (168438 => 168439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog        2014-05-07 21:17:53 UTC (rev 168438)
+++ trunk/Source/WebKit/mac/ChangeLog        2014-05-07 21:19:03 UTC (rev 168439)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-05-07  Jeremy Jones  &lt;jeremyj@apple.com&gt;
+
+        HTMLMediaElement should exitFullscreen when view is removed from the window.
+        https://bugs.webkit.org/show_bug.cgi?id=132506
+
+        Reviewed by Tim Horton.
+
+        * WebView/WebView.mm:
+        (-[WebView viewDidMoveToWindow]):
+        Request WebVideoFullscreenController to exitFullscreen when view is removed from the window.
+
</ins><span class="cx"> 2014-05-07  Brady Eidson  &lt;beidson@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Image menu is offset by the amount the view is scrolled
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (168438 => 168439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm        2014-05-07 21:17:53 UTC (rev 168438)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm        2014-05-07 21:19:03 UTC (rev 168439)
</span><span class="lines">@@ -5302,7 +5302,11 @@
</span><span class="cx">         [window setAcceleratedDrawingEnabled:[preferences acceleratedDrawingEnabled]];
</span><span class="cx"> #endif
</span><span class="cx">     }
</span><del>-    
</del><ins>+#if PLATFORM(IOS)
+    else
+        [_private-&gt;fullscreenController requestExitFullscreen];
+#endif
+
</ins><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx">     _private-&gt;page-&gt;setDeviceScaleFactor([self _deviceScaleFactor]);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (168438 => 168439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2014-05-07 21:17:53 UTC (rev 168438)
+++ trunk/Source/WebKit2/ChangeLog        2014-05-07 21:19:03 UTC (rev 168439)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-05-07  Jeremy Jones  &lt;jeremyj@apple.com&gt;
+
+        HTMLMediaElement should exitFullscreen when view is removed from the window.
+        https://bugs.webkit.org/show_bug.cgi?id=132506
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::viewStateDidChange):
+        Request WebVideoFUllscreenManagerProxy to exitFullscreen when removed from the window.
+        * UIProcess/ios/WebVideoFullscreenManagerProxy.h:
+        Make requestExitFullscreen() public instead of private.
+
</ins><span class="cx"> 2014-05-07  Alexey Proskuryakov  &lt;ap@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Make blob size computation lazy
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (168438 => 168439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp        2014-05-07 21:17:53 UTC (rev 168438)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp        2014-05-07 21:19:03 UTC (rev 168439)
</span><span class="lines">@@ -1089,13 +1089,18 @@
</span><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    if ((mayHaveChanged &amp; ViewState::IsInWindow) &amp;&amp; !(m_viewState &amp; ViewState::IsInWindow)) {
</ins><span class="cx"> #if ENABLE(INPUT_TYPE_COLOR_POPOVER)
</span><del>-    if ((mayHaveChanged &amp; ViewState::IsInWindow) &amp;&amp; !(m_viewState &amp; ViewState::IsInWindow)) {
</del><span class="cx">         // When leaving the current page, close the popover color well.
</span><span class="cx">         if (m_colorPicker)
</span><span class="cx">             endColorPicker();
</span><ins>+#endif
+#if PLATFORM(IOS)
+        // When leaving the current page, close the video fullscreen.
+        if (m_videoFullscreenManager)
+            m_videoFullscreenManager-&gt;requestExitFullscreen();
+#endif
</ins><span class="cx">     }
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     updateBackingStoreDiscardableState();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWebVideoFullscreenManagerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.h (168438 => 168439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.h        2014-05-07 21:17:53 UTC (rev 168438)
+++ trunk/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.h        2014-05-07 21:19:03 UTC (rev 168439)
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx">     virtual ~WebVideoFullscreenManagerProxy();
</span><span class="cx"> 
</span><span class="cx">     virtual void invalidate() override;
</span><ins>+    virtual void requestExitFullscreen() override;
</ins><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     explicit WebVideoFullscreenManagerProxy(WebPageProxy&amp;);
</span><span class="lines">@@ -58,7 +59,6 @@
</span><span class="cx">     void setSeekableRangesVector(Vector&lt;std::pair&lt;double, double&gt;&gt;&amp;);
</span><span class="cx"> 
</span><span class="cx">     // Fullscreen Observer
</span><del>-    virtual void requestExitFullscreen() override;
</del><span class="cx">     virtual void didExitFullscreen() override;
</span><span class="cx">     virtual void didEnterFullscreen() override;
</span><span class="cx">     
</span></span></pre>
</div>
</div>

</body>
</html>