<!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>[182860] 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/182860">182860</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2015-04-15 13:59:35 -0700 (Wed, 15 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Fullscreen] ChromeClient::exitVideoFullscreen() should take a pointer to a HTMLVideoElement.
https://bugs.webkit.org/show_bug.cgi?id=143674
Reviewed by Darin Adler.
Source/WebCore:
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::enterFullscreen): Pass a reference.
(WebCore::HTMLMediaElement::exitFullscreen): exitVideoFullscreen() -> exitVideoFullscreenForVideoElement(...).
* page/ChromeClient.h:
Source/WebKit/mac:
* WebCoreSupport/WebChromeClient.h:
* WebCoreSupport/WebChromeClient.mm:
(WebChromeClient::enterVideoFullscreenForVideoElement): Takes a reference.
(WebChromeClient::exitVideoFullscreenForVideoElement): Renamed from exitVideoFullscreen().
(WebChromeClient::exitVideoFullscreen): Deleted.
Source/WebKit/win:
* WebCoreSupport/WebChromeClient.cpp:
(WebChromeClient::enterVideoFullscreenForVideoElement): Takes a reference.
(WebChromeClient::exitVideoFullscreenForVideoElement): Renamed from exitVideoFullscreen().
(WebChromeClient::exitVideoFullscreen): Deleted.
* WebCoreSupport/WebChromeClient.h:
* WebView.cpp:
(WebView::enterVideoFullscreenForVideoElement): Takes a reference.
(WebView::exitVideoFullscreenForVideoElement): Renamed from exitVideoFullscreen().
(WebView::exitVideoFullscreen): Deleted.
* WebView.h:
Source/WebKit2:
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::enterVideoFullscreenForVideoElement): Takes a reference.
(WebKit::WebChromeClient::exitVideoFullscreenForVideoElement): Renamed from exitVideoFullscreen().
(WebKit::WebChromeClient::exitVideoFullscreen): Deleted.
* WebProcess/WebCoreSupport/WebChromeClient.h:
* WebProcess/ios/WebVideoFullscreenManager.h:
* WebProcess/ios/WebVideoFullscreenManager.mm:
(WebKit::WebVideoFullscreenManager::enterVideoFullscreenForVideoElement): Ditto.
(WebKit::WebVideoFullscreenManager::exitVideoFullscreenForVideoElement): Renamed from exitVideoFullscreen().
(WebKit::WebVideoFullscreenManager::didEnterFullscreen): Pass a reference.
(WebKit::WebVideoFullscreenManager::didCleanupFullscreen): Ditto.
(WebKit::WebVideoFullscreenManager::exitVideoFullscreen): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorepageChromeClienth">trunk/Source/WebCore/page/ChromeClient.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebChromeClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebChromeClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebChromeClientcpp">trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebChromeClienth">trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebViewh">trunk/Source/WebKit/win/WebView.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessiosWebVideoFullscreenManagerh">trunk/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessiosWebVideoFullscreenManagermm">trunk/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182859 => 182860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-15 20:54:42 UTC (rev 182859)
+++ trunk/Source/WebCore/ChangeLog 2015-04-15 20:59:35 UTC (rev 182860)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-04-13 Jer Noble <jer.noble@apple.com>
+
+ [Fullscreen] ChromeClient::exitVideoFullscreen() should take a pointer to a HTMLVideoElement.
+ https://bugs.webkit.org/show_bug.cgi?id=143674
+
+ Reviewed by Darin Adler.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::enterFullscreen): Pass a reference.
+ (WebCore::HTMLMediaElement::exitFullscreen): exitVideoFullscreen() -> exitVideoFullscreenForVideoElement(...).
+ * page/ChromeClient.h:
+
</ins><span class="cx"> 2015-04-14 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Make creating send rights from shared memory more robust
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (182859 => 182860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-04-15 20:54:42 UTC (rev 182859)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-04-15 20:59:35 UTC (rev 182860)
</span><span class="lines">@@ -4999,7 +4999,7 @@
</span><span class="cx"> if (document().page() && is<HTMLVideoElement>(*this)) {
</span><span class="cx"> HTMLVideoElement& asVideo = downcast<HTMLVideoElement>(*this);
</span><span class="cx"> if (document().page()->chrome().client().supportsVideoFullscreen()) {
</span><del>- document().page()->chrome().client().enterVideoFullscreenForVideoElement(&asVideo, m_videoFullscreenMode);
</del><ins>+ document().page()->chrome().client().enterVideoFullscreenForVideoElement(asVideo, m_videoFullscreenMode);
</ins><span class="cx"> scheduleEvent(eventNames().webkitbeginfullscreenEvent);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -5030,7 +5030,7 @@
</span><span class="cx"> pauseInternal();
</span><span class="cx">
</span><span class="cx"> if (document().page()->chrome().client().supportsVideoFullscreen()) {
</span><del>- document().page()->chrome().client().exitVideoFullscreen();
</del><ins>+ document().page()->chrome().client().exitVideoFullscreenForVideoElement(downcast<HTMLVideoElement>(*this));
</ins><span class="cx"> scheduleEvent(eventNames().webkitendfullscreenEvent);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ChromeClient.h (182859 => 182860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ChromeClient.h 2015-04-15 20:54:42 UTC (rev 182859)
+++ trunk/Source/WebCore/page/ChromeClient.h 2015-04-15 20:59:35 UTC (rev 182860)
</span><span class="lines">@@ -331,9 +331,9 @@
</span><span class="cx">
</span><span class="cx"> virtual bool supportsVideoFullscreen() { return false; }
</span><span class="cx"> #if ENABLE(VIDEO)
</span><del>- virtual void enterVideoFullscreenForVideoElement(HTMLVideoElement*, HTMLMediaElement::VideoFullscreenMode) { }
</del><ins>+ virtual void enterVideoFullscreenForVideoElement(HTMLVideoElement&, HTMLMediaElement::VideoFullscreenMode) { }
</ins><span class="cx"> #endif
</span><del>- virtual void exitVideoFullscreen() { }
</del><ins>+ virtual void exitVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&) { }
</ins><span class="cx"> virtual bool requiresFullscreenForVideoPlayback() { return false; }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (182859 => 182860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-04-15 20:54:42 UTC (rev 182859)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-04-15 20:59:35 UTC (rev 182860)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-04-13 Jer Noble <jer.noble@apple.com>
+
+ [Fullscreen] ChromeClient::exitVideoFullscreen() should take a pointer to a HTMLVideoElement.
+ https://bugs.webkit.org/show_bug.cgi?id=143674
+
+ Reviewed by Darin Adler.
+
+ * WebCoreSupport/WebChromeClient.h:
+ * WebCoreSupport/WebChromeClient.mm:
+ (WebChromeClient::enterVideoFullscreenForVideoElement): Takes a reference.
+ (WebChromeClient::exitVideoFullscreenForVideoElement): Renamed from exitVideoFullscreen().
+ (WebChromeClient::exitVideoFullscreen): Deleted.
+
</ins><span class="cx"> 2015-04-14 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Re-enable custom dilation for antialiased fonts
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h (182859 => 182860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2015-04-15 20:54:42 UTC (rev 182859)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2015-04-15 20:59:35 UTC (rev 182860)
</span><span class="lines">@@ -179,8 +179,8 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx"> virtual bool supportsVideoFullscreen() override;
</span><del>- virtual void enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement*, WebCore::HTMLMediaElement::VideoFullscreenMode) override;
- virtual void exitVideoFullscreen() override;
</del><ins>+ virtual void enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&, WebCore::HTMLMediaElement::VideoFullscreenMode) override;
+ virtual void exitVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&) override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebChromeClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm (182859 => 182860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2015-04-15 20:54:42 UTC (rev 182859)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2015-04-15 20:59:35 UTC (rev 182860)
</span><span class="lines">@@ -933,15 +933,15 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebChromeClient::enterVideoFullscreenForVideoElement(HTMLVideoElement* videoElement, HTMLMediaElement::VideoFullscreenMode mode)
</del><ins>+void WebChromeClient::enterVideoFullscreenForVideoElement(HTMLVideoElement& videoElement, HTMLMediaElement::VideoFullscreenMode mode)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(mode != HTMLMediaElement::VideoFullscreenModeNone);
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><del>- [m_webView _enterVideoFullscreenForVideoElement:videoElement mode:mode];
</del><ins>+ [m_webView _enterVideoFullscreenForVideoElement:&videoElement mode:mode];
</ins><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebChromeClient::exitVideoFullscreen()
</del><ins>+void WebChromeClient::exitVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&)
</ins><span class="cx"> {
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx"> [m_webView _exitVideoFullscreen];
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (182859 => 182860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2015-04-15 20:54:42 UTC (rev 182859)
+++ trunk/Source/WebKit/win/ChangeLog 2015-04-15 20:59:35 UTC (rev 182860)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-04-13 Jer Noble <jer.noble@apple.com>
+
+ [Fullscreen] ChromeClient::exitVideoFullscreen() should take a pointer to a HTMLVideoElement.
+ https://bugs.webkit.org/show_bug.cgi?id=143674
+
+ Reviewed by Darin Adler.
+
+ * WebCoreSupport/WebChromeClient.cpp:
+ (WebChromeClient::enterVideoFullscreenForVideoElement): Takes a reference.
+ (WebChromeClient::exitVideoFullscreenForVideoElement): Renamed from exitVideoFullscreen().
+ (WebChromeClient::exitVideoFullscreen): Deleted.
+ * WebCoreSupport/WebChromeClient.h:
+ * WebView.cpp:
+ (WebView::enterVideoFullscreenForVideoElement): Takes a reference.
+ (WebView::exitVideoFullscreenForVideoElement): Renamed from exitVideoFullscreen().
+ (WebView::exitVideoFullscreen): Deleted.
+ * WebView.h:
+
</ins><span class="cx"> 2015-04-13 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Add force property to MouseEvents
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp (182859 => 182860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp 2015-04-15 20:54:42 UTC (rev 182859)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp 2015-04-15 20:59:35 UTC (rev 182860)
</span><span class="lines">@@ -766,14 +766,14 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebChromeClient::enterVideoFullscreenForVideoElement(HTMLVideoElement* videoElement)
</del><ins>+void WebChromeClient::enterVideoFullscreenForVideoElement(HTMLVideoElement& videoElement)
</ins><span class="cx"> {
</span><span class="cx"> m_webView->enterVideoFullscreenForVideoElement(videoElement);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebChromeClient::exitVideoFullscreen()
</del><ins>+void WebChromeClient::exitVideoFullscreenForVideoElement(HTMLVideoElement& videoElement)
</ins><span class="cx"> {
</span><del>- m_webView->exitVideoFullscreen();
</del><ins>+ m_webView->exitVideoFullscreenForVideoElement(videoElement);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h (182859 => 182860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h 2015-04-15 20:54:42 UTC (rev 182859)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h 2015-04-15 20:59:35 UTC (rev 182860)
</span><span class="lines">@@ -146,8 +146,8 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx"> virtual bool supportsVideoFullscreen();
</span><del>- virtual void enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement*);
- virtual void exitVideoFullscreen();
</del><ins>+ virtual void enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&);
+ virtual void exitVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (182859 => 182860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp 2015-04-15 20:54:42 UTC (rev 182859)
+++ trunk/Source/WebKit/win/WebView.cpp 2015-04-15 20:59:35 UTC (rev 182860)
</span><span class="lines">@@ -6356,14 +6356,14 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebView::enterVideoFullscreenForVideoElement(HTMLVideoElement* videoElement)
</del><ins>+void WebView::enterVideoFullscreenForVideoElement(HTMLVideoElement& videoElement)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(VIDEO) && !USE(GSTREAMER) && !USE(MEDIA_FOUNDATION)
</span><span class="cx"> if (m_fullScreenVideoController) {
</span><del>- if (m_fullScreenVideoController->videoElement() == videoElement) {
</del><ins>+ if (m_fullScreenVideoController->videoElement() == &videoElement) {
</ins><span class="cx"> // The backend may just warn us that the underlaying plaftormMovie()
</span><span class="cx"> // has changed. Just force an update.
</span><del>- m_fullScreenVideoController->setVideoElement(videoElement);
</del><ins>+ m_fullScreenVideoController->setVideoElement(&videoElement);
</ins><span class="cx"> return; // No more to do.
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -6375,12 +6375,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_fullScreenVideoController = std::make_unique<FullscreenVideoController>();
</span><del>- m_fullScreenVideoController->setVideoElement(videoElement);
</del><ins>+ m_fullScreenVideoController->setVideoElement(&videoElement);
</ins><span class="cx"> m_fullScreenVideoController->enterFullscreen();
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebView::exitVideoFullscreen()
</del><ins>+void WebView::exitVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(VIDEO) && !USE(GSTREAMER) && !USE(MEDIA_FOUNDATION)
</span><span class="cx"> if (!m_fullScreenVideoController)
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.h (182859 => 182860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.h 2015-04-15 20:54:42 UTC (rev 182859)
+++ trunk/Source/WebKit/win/WebView.h 2015-04-15 20:59:35 UTC (rev 182860)
</span><span class="lines">@@ -944,8 +944,8 @@
</span><span class="cx"> WebCore::GraphicsDeviceAdapter* graphicsDeviceAdapter() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- void enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement*);
- void exitVideoFullscreen();
</del><ins>+ void enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&);
+ void exitVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&);
</ins><span class="cx">
</span><span class="cx"> void setLastCursor(HCURSOR cursor) { m_lastSetCursor = cursor; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (182859 => 182860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-15 20:54:42 UTC (rev 182859)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-15 20:59:35 UTC (rev 182860)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-04-13 Jer Noble <jer.noble@apple.com>
+
+ [Fullscreen] ChromeClient::exitVideoFullscreen() should take a pointer to a HTMLVideoElement.
+ https://bugs.webkit.org/show_bug.cgi?id=143674
+
+ Reviewed by Darin Adler.
+
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::enterVideoFullscreenForVideoElement): Takes a reference.
+ (WebKit::WebChromeClient::exitVideoFullscreenForVideoElement): Renamed from exitVideoFullscreen().
+ (WebKit::WebChromeClient::exitVideoFullscreen): Deleted.
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+ * WebProcess/ios/WebVideoFullscreenManager.h:
+ * WebProcess/ios/WebVideoFullscreenManager.mm:
+ (WebKit::WebVideoFullscreenManager::enterVideoFullscreenForVideoElement): Ditto.
+ (WebKit::WebVideoFullscreenManager::exitVideoFullscreenForVideoElement): Renamed from exitVideoFullscreen().
+ (WebKit::WebVideoFullscreenManager::didEnterFullscreen): Pass a reference.
+ (WebKit::WebVideoFullscreenManager::didCleanupFullscreen): Ditto.
+ (WebKit::WebVideoFullscreenManager::exitVideoFullscreen): Deleted.
+
</ins><span class="cx"> 2015-04-15 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Network Cache: Inline small body data to record file
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (182859 => 182860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-04-15 20:54:42 UTC (rev 182859)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2015-04-15 20:59:35 UTC (rev 182860)
</span><span class="lines">@@ -911,15 +911,15 @@
</span><span class="cx"> return m_page->videoFullscreenManager()->supportsVideoFullscreen();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebChromeClient::enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement* videoElement, WebCore::HTMLMediaElement::VideoFullscreenMode mode)
</del><ins>+void WebChromeClient::enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement& videoElement, WebCore::HTMLMediaElement::VideoFullscreenMode mode)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(mode != HTMLMediaElement::VideoFullscreenModeNone);
</span><span class="cx"> m_page->videoFullscreenManager()->enterVideoFullscreenForVideoElement(videoElement, mode);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebChromeClient::exitVideoFullscreen()
</del><ins>+void WebChromeClient::exitVideoFullscreenForVideoElement(WebCore::HTMLVideoElement& videoElement)
</ins><span class="cx"> {
</span><del>- m_page->videoFullscreenManager()->exitVideoFullscreen();
</del><ins>+ m_page->videoFullscreenManager()->exitVideoFullscreenForVideoElement(videoElement);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (182859 => 182860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2015-04-15 20:54:42 UTC (rev 182859)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2015-04-15 20:59:35 UTC (rev 182860)
</span><span class="lines">@@ -250,8 +250,8 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> virtual bool supportsVideoFullscreen() override;
</span><del>- virtual void enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement*, WebCore::HTMLMediaElement::VideoFullscreenMode) override;
- virtual void exitVideoFullscreen() override;
</del><ins>+ virtual void enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&, WebCore::HTMLMediaElement::VideoFullscreenMode) override;
+ virtual void exitVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&) override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessiosWebVideoFullscreenManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.h (182859 => 182860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.h 2015-04-15 20:54:42 UTC (rev 182859)
+++ trunk/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.h 2015-04-15 20:59:35 UTC (rev 182860)
</span><span class="lines">@@ -60,8 +60,8 @@
</span><span class="cx"> void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) override;
</span><span class="cx">
</span><span class="cx"> bool supportsVideoFullscreen() const;
</span><del>- void enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement*, WebCore::HTMLMediaElement::VideoFullscreenMode);
- void exitVideoFullscreen();
</del><ins>+ void enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&, WebCore::HTMLMediaElement::VideoFullscreenMode);
+ void exitVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&);
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> explicit WebVideoFullscreenManager(PassRefPtr<WebPage>);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessiosWebVideoFullscreenManagermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.mm (182859 => 182860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.mm 2015-04-15 20:54:42 UTC (rev 182859)
+++ trunk/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.mm 2015-04-15 20:59:35 UTC (rev 182860)
</span><span class="lines">@@ -86,11 +86,11 @@
</span><span class="cx"> return Settings::avKitEnabled();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebVideoFullscreenManager::enterVideoFullscreenForVideoElement(HTMLVideoElement* videoElement, HTMLMediaElement::VideoFullscreenMode mode)
</del><ins>+void WebVideoFullscreenManager::enterVideoFullscreenForVideoElement(HTMLVideoElement& videoElement, HTMLMediaElement::VideoFullscreenMode mode)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(mode != HTMLMediaElement::VideoFullscreenModeNone);
</span><span class="cx">
</span><del>- m_videoElement = videoElement;
</del><ins>+ m_videoElement = &videoElement;
</ins><span class="cx">
</span><span class="cx"> m_targetIsFullscreen = true;
</span><span class="cx"> m_fullscreenMode = mode;
</span><span class="lines">@@ -99,15 +99,15 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_isAnimating = true;
</span><del>- setVideoElement(videoElement);
</del><ins>+ setVideoElement(&videoElement);
</ins><span class="cx">
</span><span class="cx"> m_layerHostingContext = LayerHostingContext::createForExternalHostingProcess();
</span><span class="cx"> bool allowOptimizedFullscreen = m_videoElement->mediaSession().allowsAlternateFullscreen(*m_videoElement.get());
</span><span class="cx">
</span><del>- m_page->send(Messages::WebVideoFullscreenManagerProxy::SetupFullscreenWithID(m_layerHostingContext->contextID(), clientRectForElement(videoElement), m_page->deviceScaleFactor(), m_fullscreenMode, allowOptimizedFullscreen), m_page->pageID());
</del><ins>+ m_page->send(Messages::WebVideoFullscreenManagerProxy::SetupFullscreenWithID(m_layerHostingContext->contextID(), clientRectForElement(&videoElement), m_page->deviceScaleFactor(), m_fullscreenMode, allowOptimizedFullscreen), m_page->pageID());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebVideoFullscreenManager::exitVideoFullscreen()
</del><ins>+void WebVideoFullscreenManager::exitVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<HTMLVideoElement> videoElement = m_videoElement.release();
</span><span class="cx"> m_targetIsFullscreen = false;
</span><span class="lines">@@ -219,7 +219,7 @@
</span><span class="cx"> // exit fullscreen now if it was previously requested during an animation.
</span><span class="cx"> __block RefPtr<WebVideoFullscreenModelVideoElement> protect(this);
</span><span class="cx"> WebThreadRun(^ {
</span><del>- exitVideoFullscreen();
</del><ins>+ exitVideoFullscreenForVideoElement(*m_videoElement);
</ins><span class="cx"> protect.clear();
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -253,7 +253,7 @@
</span><span class="cx"> // enter fullscreen now if it was previously requested during an animation.
</span><span class="cx"> __block RefPtr<WebVideoFullscreenModelVideoElement> protect(this);
</span><span class="cx"> WebThreadRun(^ {
</span><del>- enterVideoFullscreenForVideoElement(m_videoElement.get(), m_fullscreenMode);
</del><ins>+ enterVideoFullscreenForVideoElement(*m_videoElement, m_fullscreenMode);
</ins><span class="cx"> protect.clear();
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>