<!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>[195487] 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/195487">195487</a></dd>
<dt>Author</dt> <dd>adachan@apple.com</dd>
<dt>Date</dt> <dd>2016-01-22 15:26:42 -0800 (Fri, 22 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a mode parameter to MediaControllerInterface::supportsFullscreen() and ChromeClient::supportsVideoFullscreen().
https://bugs.webkit.org/show_bug.cgi?id=153220
Reviewed by Eric Carlson.
Source/WebCore:
No new tests, just code refactoring.
* Modules/mediacontrols/MediaControlsHost.cpp:
(WebCore::MediaControlsHost::supportsFullscreen):
Just pass in VideoFullscreenModeStandard as this is used for checking the standard fullscreen case.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::enterFullscreen):
Only use the FullScreen API if the mode is VideoFullscreenModeStandard. Call ChromeClient::supportsVideoFullscreen()
with the mode.
(WebCore::HTMLMediaElement::exitFullscreen):
Move the fullscreen element check up so we can use this method to exit picture-in-picture mode.
* html/HTMLMediaElement.h:
* html/HTMLVideoElement.cpp:
(WebCore::HTMLVideoElement::supportsFullscreen):
Ditto.
(WebCore::HTMLVideoElement::webkitEnterFullscreen):
Pass in VideoFullscreenModeStandard to supportsFullscreen() as this is used for the standard fullscreen case.
(WebCore::HTMLVideoElement::webkitSupportsFullscreen):
Ditto.
(WebCore::HTMLVideoElement::webkitSupportsPresentationMode):
Pass in the correct VideoFullscreenMode to supportsFullscreen() corresponding to the mode string passed in.
(WebCore::HTMLVideoElement::setFullscreenMode):
Pass in the mode to supportsFullscreen().
* html/HTMLVideoElement.h:
* html/MediaController.h:
* html/MediaControllerInterface.h:
Make supportsFullscreen() take a VideoFullscreenMode.
* html/shadow/MediaControls.cpp:
(WebCore::MediaControls::reset):
Pass in VideoFullscreenModeStandard to supportsFullscreen() here since this is used for the standard
fullscreen button.
* html/shadow/MediaControlsApple.cpp:
(WebCore::MediaControlsApple::reset):
Ditto.
* page/ChromeClient.h:
Make supportsVideoFullscreen() take a VideoFullscreenMode.
* rendering/HitTestResult.cpp:
(WebCore::HitTestResult::mediaSupportsFullscreen):
(WebCore::HitTestResult::toggleMediaFullscreenState):
(WebCore::HitTestResult::enterFullscreenForVideo):
Pass in VideoFullscreenModeStandard in the code relating to the standard fullscreen.
Source/WebKit/mac:
* WebCoreSupport/WebChromeClient.h:
* WebCoreSupport/WebChromeClient.mm:
(WebChromeClient::supportsVideoFullscreen):
Source/WebKit/win:
* WebCoreSupport/WebChromeClient.cpp:
(WebChromeClient::supportsVideoFullscreen):
* WebCoreSupport/WebChromeClient.h:
Source/WebKit2:
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::supportsVideoFullscreen):
* WebProcess/WebCoreSupport/WebChromeClient.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsMediaControlsHostcpp">trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementh">trunk/Source/WebCore/html/HTMLMediaElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLVideoElementcpp">trunk/Source/WebCore/html/HTMLVideoElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLVideoElementh">trunk/Source/WebCore/html/HTMLVideoElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlMediaControllerh">trunk/Source/WebCore/html/MediaController.h</a></li>
<li><a href="#trunkSourceWebCorehtmlMediaControllerInterfaceh">trunk/Source/WebCore/html/MediaControllerInterface.h</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlscpp">trunk/Source/WebCore/html/shadow/MediaControls.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlsApplecpp">trunk/Source/WebCore/html/shadow/MediaControlsApple.cpp</a></li>
<li><a href="#trunkSourceWebCorepageChromeClienth">trunk/Source/WebCore/page/ChromeClient.h</a></li>
<li><a href="#trunkSourceWebCorerenderingHitTestResultcpp">trunk/Source/WebCore/rendering/HitTestResult.cpp</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="#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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195486 => 195487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-22 23:25:35 UTC (rev 195486)
+++ trunk/Source/WebCore/ChangeLog 2016-01-22 23:26:42 UTC (rev 195487)
</span><span class="lines">@@ -1,3 +1,58 @@
</span><ins>+2016-01-17 Ada Chan <adachan@apple.com>
+
+ Add a mode parameter to MediaControllerInterface::supportsFullscreen() and ChromeClient::supportsVideoFullscreen().
+ https://bugs.webkit.org/show_bug.cgi?id=153220
+
+ Reviewed by Eric Carlson.
+
+ No new tests, just code refactoring.
+
+ * Modules/mediacontrols/MediaControlsHost.cpp:
+ (WebCore::MediaControlsHost::supportsFullscreen):
+ Just pass in VideoFullscreenModeStandard as this is used for checking the standard fullscreen case.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::enterFullscreen):
+ Only use the FullScreen API if the mode is VideoFullscreenModeStandard. Call ChromeClient::supportsVideoFullscreen()
+ with the mode.
+ (WebCore::HTMLMediaElement::exitFullscreen):
+ Move the fullscreen element check up so we can use this method to exit picture-in-picture mode.
+ * html/HTMLMediaElement.h:
+
+ * html/HTMLVideoElement.cpp:
+ (WebCore::HTMLVideoElement::supportsFullscreen):
+ Ditto.
+ (WebCore::HTMLVideoElement::webkitEnterFullscreen):
+ Pass in VideoFullscreenModeStandard to supportsFullscreen() as this is used for the standard fullscreen case.
+ (WebCore::HTMLVideoElement::webkitSupportsFullscreen):
+ Ditto.
+ (WebCore::HTMLVideoElement::webkitSupportsPresentationMode):
+ Pass in the correct VideoFullscreenMode to supportsFullscreen() corresponding to the mode string passed in.
+ (WebCore::HTMLVideoElement::setFullscreenMode):
+ Pass in the mode to supportsFullscreen().
+ * html/HTMLVideoElement.h:
+
+ * html/MediaController.h:
+ * html/MediaControllerInterface.h:
+ Make supportsFullscreen() take a VideoFullscreenMode.
+
+ * html/shadow/MediaControls.cpp:
+ (WebCore::MediaControls::reset):
+ Pass in VideoFullscreenModeStandard to supportsFullscreen() here since this is used for the standard
+ fullscreen button.
+ * html/shadow/MediaControlsApple.cpp:
+ (WebCore::MediaControlsApple::reset):
+ Ditto.
+
+ * page/ChromeClient.h:
+ Make supportsVideoFullscreen() take a VideoFullscreenMode.
+
+ * rendering/HitTestResult.cpp:
+ (WebCore::HitTestResult::mediaSupportsFullscreen):
+ (WebCore::HitTestResult::toggleMediaFullscreenState):
+ (WebCore::HitTestResult::enterFullscreenForVideo):
+ Pass in VideoFullscreenModeStandard in the code relating to the standard fullscreen.
+
</ins><span class="cx"> 2016-01-22 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Document.URL / Document.documentURI should return "about:blank" instead of empty string / null
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsMediaControlsHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp (195486 => 195487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp 2016-01-22 23:25:35 UTC (rev 195486)
+++ trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp 2016-01-22 23:26:42 UTC (rev 195487)
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx">
</span><span class="cx"> bool MediaControlsHost::supportsFullscreen()
</span><span class="cx"> {
</span><del>- return m_mediaElement->supportsFullscreen();
</del><ins>+ return m_mediaElement->supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenModeStandard);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool MediaControlsHost::userGestureRequired() const
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (195486 => 195487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-01-22 23:25:35 UTC (rev 195486)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-01-22 23:26:42 UTC (rev 195487)
</span><span class="lines">@@ -5291,7 +5291,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><del>- if (document().settings() && document().settings()->fullScreenEnabled()) {
</del><ins>+ if (mode == VideoFullscreenModeStandard && document().settings() && document().settings()->fullScreenEnabled()) {
</ins><span class="cx"> document().requestFullScreenForElement(this, 0, Document::ExemptIFrameAllowFullScreenRequirement);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -5302,7 +5302,7 @@
</span><span class="cx"> mediaControls()->enteredFullscreen();
</span><span class="cx"> if (document().page() && is<HTMLVideoElement>(*this)) {
</span><span class="cx"> HTMLVideoElement& asVideo = downcast<HTMLVideoElement>(*this);
</span><del>- if (document().page()->chrome().client().supportsVideoFullscreen()) {
</del><ins>+ if (document().page()->chrome().client().supportsVideoFullscreen(m_videoFullscreenMode)) {
</ins><span class="cx"> document().page()->chrome().client().enterVideoFullscreenForVideoElement(asVideo, m_videoFullscreenMode);
</span><span class="cx"> scheduleEvent(eventNames().webkitbeginfullscreenEvent);
</span><span class="cx"> }
</span><span class="lines">@@ -5319,13 +5319,15 @@
</span><span class="cx"> LOG(Media, "HTMLMediaElement::exitFullscreen(%p)", this);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><del>- if (document().settings() && document().settings()->fullScreenEnabled()) {
- if (document().webkitIsFullScreen() && document().webkitCurrentFullScreenElement() == this)
</del><ins>+ if (document().settings() && document().settings()->fullScreenEnabled() && document().webkitCurrentFullScreenElement() == this) {
+ if (document().webkitIsFullScreen())
</ins><span class="cx"> document().webkitCancelFullScreen();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><ins>+
</ins><span class="cx"> ASSERT(m_videoFullscreenMode != VideoFullscreenModeNone);
</span><ins>+ VideoFullscreenMode oldVideoFullscreenMode = m_videoFullscreenMode;
</ins><span class="cx"> fullscreenModeChanged(VideoFullscreenModeNone);
</span><span class="cx"> if (hasMediaControls())
</span><span class="cx"> mediaControls()->exitedFullscreen();
</span><span class="lines">@@ -5333,7 +5335,7 @@
</span><span class="cx"> if (m_mediaSession->requiresFullscreenForVideoPlayback(*this))
</span><span class="cx"> pauseInternal();
</span><span class="cx">
</span><del>- if (document().page()->chrome().client().supportsVideoFullscreen()) {
</del><ins>+ if (document().page()->chrome().client().supportsVideoFullscreen(oldVideoFullscreenMode)) {
</ins><span class="cx"> document().page()->chrome().client().exitVideoFullscreenForVideoElement(downcast<HTMLVideoElement>(*this));
</span><span class="cx"> scheduleEvent(eventNames().webkitendfullscreenEvent);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (195486 => 195487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2016-01-22 23:25:35 UTC (rev 195486)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2016-01-22 23:26:42 UTC (rev 195487)
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> WEBCORE_EXPORT virtual void returnToRealtime() override;
</span><span class="cx">
</span><span class="cx"> // Eventually overloaded in HTMLVideoElement
</span><del>- virtual bool supportsFullscreen() const override { return false; };
</del><ins>+ virtual bool supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenMode) const override { return false; };
</ins><span class="cx">
</span><span class="cx"> virtual bool supportsScanning() const override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLVideoElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLVideoElement.cpp (195486 => 195487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLVideoElement.cpp 2016-01-22 23:25:35 UTC (rev 195486)
+++ trunk/Source/WebCore/html/HTMLVideoElement.cpp 2016-01-22 23:26:42 UTC (rev 195487)
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool HTMLVideoElement::supportsFullscreen() const
</del><ins>+bool HTMLVideoElement::supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenMode videoFullscreenMode) const
</ins><span class="cx"> {
</span><span class="cx"> Page* page = document().page();
</span><span class="cx"> if (!page)
</span><span class="lines">@@ -154,20 +154,21 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><ins>+ UNUSED_PARAM(videoFullscreenMode);
</ins><span class="cx"> // Fullscreen implemented by player.
</span><span class="cx"> return true;
</span><span class="cx"> #else
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="cx"> // If the full screen API is enabled and is supported for the current element
</span><span class="cx"> // do not require that the player has a video track to enter full screen.
</span><del>- if (page->chrome().client().supportsFullScreenForElement(this, false))
</del><ins>+ if (videoFullscreenMode == HTMLMediaElementEnums::VideoFullscreenModeStandard && page->chrome().client().supportsFullScreenForElement(this, false))
</ins><span class="cx"> return true;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (!player()->hasVideo())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- return page->chrome().client().supportsVideoFullscreen();
</del><ins>+ return page->chrome().client().supportsVideoFullscreen(videoFullscreenMode);
</ins><span class="cx"> #endif // PLATFORM(IOS)
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -279,7 +280,7 @@
</span><span class="cx">
</span><span class="cx"> // Generate an exception if this isn't called in response to a user gesture, or if the
</span><span class="cx"> // element does not support fullscreen.
</span><del>- if (!mediaSession().fullscreenPermitted(*this) || !supportsFullscreen()) {
</del><ins>+ if (!mediaSession().fullscreenPermitted(*this) || !supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenModeStandard)) {
</ins><span class="cx"> ec = INVALID_STATE_ERR;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -295,7 +296,7 @@
</span><span class="cx">
</span><span class="cx"> bool HTMLVideoElement::webkitSupportsFullscreen()
</span><span class="cx"> {
</span><del>- return supportsFullscreen();
</del><ins>+ return supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenModeStandard);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool HTMLVideoElement::webkitDisplayingFullscreen()
</span><span class="lines">@@ -371,7 +372,7 @@
</span><span class="cx"> bool HTMLVideoElement::webkitSupportsPresentationMode(const String& mode) const
</span><span class="cx"> {
</span><span class="cx"> if (mode == presentationModeFullscreen())
</span><del>- return mediaSession().fullscreenPermitted(*this) && supportsFullscreen();
</del><ins>+ return mediaSession().fullscreenPermitted(*this) && supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenModeStandard);
</ins><span class="cx">
</span><span class="cx"> if (mode == presentationModePictureInPicture()) {
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="lines">@@ -379,7 +380,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- return mediaSession().allowsPictureInPicture(*this) && supportsFullscreen();
</del><ins>+ return mediaSession().allowsPictureInPicture(*this) && supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenModePictureInPicture);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (mode == presentationModeInline())
</span><span class="lines">@@ -424,7 +425,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!mediaSession().fullscreenPermitted(*this) || !supportsFullscreen())
</del><ins>+ if (!mediaSession().fullscreenPermitted(*this) || !supportsFullscreen(mode))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> enterFullscreen(mode);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLVideoElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLVideoElement.h (195486 => 195487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLVideoElement.h 2016-01-22 23:25:35 UTC (rev 195486)
+++ trunk/Source/WebCore/html/HTMLVideoElement.h 2016-01-22 23:26:42 UTC (rev 195487)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) override;
</span><span class="cx"> virtual bool isVideo() const override { return true; }
</span><span class="cx"> virtual bool hasVideo() const override { return player() && player()->hasVideo(); }
</span><del>- virtual bool supportsFullscreen() const override;
</del><ins>+ virtual bool supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenMode) const override;
</ins><span class="cx"> virtual bool isURLAttribute(const Attribute&) const override;
</span><span class="cx"> virtual const AtomicString& imageSourceURL() const override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaController.h (195486 => 195487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaController.h 2016-01-22 23:25:35 UTC (rev 195486)
+++ trunk/Source/WebCore/html/MediaController.h 2016-01-22 23:26:42 UTC (rev 195487)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> enum PlaybackState { WAITING, PLAYING, ENDED };
</span><span class="cx"> const AtomicString& playbackState() const;
</span><span class="cx">
</span><del>- virtual bool supportsFullscreen() const override { return false; }
</del><ins>+ virtual bool supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenMode) const override { return false; }
</ins><span class="cx"> virtual bool isFullscreen() const override { return false; }
</span><span class="cx"> virtual void enterFullscreen() override { }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaControllerInterfaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaControllerInterface.h (195486 => 195487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaControllerInterface.h 2016-01-22 23:25:35 UTC (rev 195486)
+++ trunk/Source/WebCore/html/MediaControllerInterface.h 2016-01-22 23:26:42 UTC (rev 195487)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> virtual ReadyState readyState() const = 0;
</span><span class="cx">
</span><span class="cx"> // MediaControlElements:
</span><del>- virtual bool supportsFullscreen() const = 0;
</del><ins>+ virtual bool supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenMode) const = 0;
</ins><span class="cx"> virtual bool isFullscreen() const = 0;
</span><span class="cx"> virtual void enterFullscreen() = 0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MediaControls.cpp (195486 => 195487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControls.cpp 2016-01-22 23:25:35 UTC (rev 195486)
+++ trunk/Source/WebCore/html/shadow/MediaControls.cpp 2016-01-22 23:26:42 UTC (rev 195487)
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> refreshClosedCaptionsButtonVisibility();
</span><span class="cx">
</span><span class="cx"> if (m_fullScreenButton) {
</span><del>- if (m_mediaController->supportsFullscreen() && m_mediaController->hasVideo())
</del><ins>+ if (m_mediaController->supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenModeStandard) && m_mediaController->hasVideo())
</ins><span class="cx"> m_fullScreenButton->show();
</span><span class="cx"> else
</span><span class="cx"> m_fullScreenButton->hide();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlsApplecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MediaControlsApple.cpp (195486 => 195487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControlsApple.cpp 2016-01-22 23:25:35 UTC (rev 195486)
+++ trunk/Source/WebCore/html/shadow/MediaControlsApple.cpp 2016-01-22 23:26:42 UTC (rev 195487)
</span><span class="lines">@@ -307,7 +307,7 @@
</span><span class="cx">
</span><span class="cx"> updateStatusDisplay();
</span><span class="cx">
</span><del>- if (m_mediaController->supportsFullscreen())
</del><ins>+ if (m_mediaController->supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenModeStandard))
</ins><span class="cx"> m_fullScreenButton->show();
</span><span class="cx"> else
</span><span class="cx"> m_fullScreenButton->hide();
</span></span></pre></div>
<a id="trunkSourceWebCorepageChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ChromeClient.h (195486 => 195487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ChromeClient.h 2016-01-22 23:25:35 UTC (rev 195486)
+++ trunk/Source/WebCore/page/ChromeClient.h 2016-01-22 23:26:42 UTC (rev 195487)
</span><span class="lines">@@ -338,7 +338,7 @@
</span><span class="cx"> virtual GraphicsDeviceAdapter* graphicsDeviceAdapter() const { return 0; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- virtual bool supportsVideoFullscreen() { return false; }
</del><ins>+ virtual bool supportsVideoFullscreen(HTMLMediaElementEnums::VideoFullscreenMode) { return false; }
</ins><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx"> virtual void enterVideoFullscreenForVideoElement(HTMLVideoElement&, HTMLMediaElementEnums::VideoFullscreenMode) { }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingHitTestResultcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/HitTestResult.cpp (195486 => 195487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/HitTestResult.cpp 2016-01-22 23:25:35 UTC (rev 195486)
+++ trunk/Source/WebCore/rendering/HitTestResult.cpp 2016-01-22 23:26:42 UTC (rev 195487)
</span><span class="lines">@@ -406,7 +406,7 @@
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx"> HTMLMediaElement* mediaElt(mediaElement());
</span><del>- return is<HTMLVideoElement>(mediaElt) && mediaElt->supportsFullscreen();
</del><ins>+ return is<HTMLVideoElement>(mediaElt) && mediaElt->supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenModeStandard);
</ins><span class="cx"> #else
</span><span class="cx"> return false;
</span><span class="cx"> #endif
</span><span class="lines">@@ -456,7 +456,7 @@
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx"> if (HTMLMediaElement* mediaElement = this->mediaElement()) {
</span><del>- if (mediaElement->isVideo() && mediaElement->supportsFullscreen()) {
</del><ins>+ if (mediaElement->isVideo() && mediaElement->supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenModeStandard)) {
</ins><span class="cx"> UserGestureIndicator indicator(DefinitelyProcessingUserGesture, &mediaElement->document());
</span><span class="cx"> mediaElement->toggleFullscreenState();
</span><span class="cx"> }
</span><span class="lines">@@ -470,7 +470,7 @@
</span><span class="cx"> HTMLMediaElement* mediaElement(this->mediaElement());
</span><span class="cx"> if (is<HTMLVideoElement>(mediaElement)) {
</span><span class="cx"> HTMLVideoElement& videoElement = downcast<HTMLVideoElement>(*mediaElement);
</span><del>- if (!videoElement.isFullscreen() && mediaElement->supportsFullscreen()) {
</del><ins>+ if (!videoElement.isFullscreen() && mediaElement->supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenModeStandard)) {
</ins><span class="cx"> UserGestureIndicator indicator(DefinitelyProcessingUserGesture, &mediaElement->document());
</span><span class="cx"> videoElement.enterFullscreen();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (195486 => 195487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-01-22 23:25:35 UTC (rev 195486)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-01-22 23:26:42 UTC (rev 195487)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-01-17 Ada Chan <adachan@apple.com>
+
+ Add a mode parameter to MediaControllerInterface::supportsFullscreen() and ChromeClient::supportsVideoFullscreen().
+ https://bugs.webkit.org/show_bug.cgi?id=153220
+
+ Reviewed by Eric Carlson.
+
+ * WebCoreSupport/WebChromeClient.h:
+ * WebCoreSupport/WebChromeClient.mm:
+ (WebChromeClient::supportsVideoFullscreen):
+
</ins><span class="cx"> 2016-01-22 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Reduce use of equalIgnoringCase to just ignore ASCII case
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h (195486 => 195487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2016-01-22 23:25:35 UTC (rev 195486)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2016-01-22 23:26:42 UTC (rev 195487)
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span><del>- virtual bool supportsVideoFullscreen() override;
</del><ins>+ virtual bool supportsVideoFullscreen(WebCore::HTMLMediaElementEnums::VideoFullscreenMode) override;
</ins><span class="cx"> virtual void enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&, WebCore::HTMLMediaElementEnums::VideoFullscreenMode) override;
</span><span class="cx"> virtual void exitVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&) override;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebChromeClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm (195486 => 195487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2016-01-22 23:25:35 UTC (rev 195486)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2016-01-22 23:26:42 UTC (rev 195487)
</span><span class="lines">@@ -910,7 +910,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx">
</span><del>-bool WebChromeClient::supportsVideoFullscreen()
</del><ins>+bool WebChromeClient::supportsVideoFullscreen(HTMLMediaElementEnums::VideoFullscreenMode)
</ins><span class="cx"> {
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> if (!Settings::avKitEnabled())
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (195486 => 195487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2016-01-22 23:25:35 UTC (rev 195486)
+++ trunk/Source/WebKit/win/ChangeLog 2016-01-22 23:26:42 UTC (rev 195487)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-01-17 Ada Chan <adachan@apple.com>
+
+ Add a mode parameter to MediaControllerInterface::supportsFullscreen() and ChromeClient::supportsVideoFullscreen().
+ https://bugs.webkit.org/show_bug.cgi?id=153220
+
+ Reviewed by Eric Carlson.
+
+ * WebCoreSupport/WebChromeClient.cpp:
+ (WebChromeClient::supportsVideoFullscreen):
+ * WebCoreSupport/WebChromeClient.h:
+
</ins><span class="cx"> 2016-01-22 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> Remove PassRefPtr from ResourceRequest and FormData
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp (195486 => 195487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp 2016-01-22 23:25:35 UTC (rev 195486)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp 2016-01-22 23:26:42 UTC (rev 195487)
</span><span class="lines">@@ -747,7 +747,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx">
</span><del>-bool WebChromeClient::supportsVideoFullscreen()
</del><ins>+bool WebChromeClient::supportsVideoFullscreen(HTMLMediaElementEnums::VideoFullscreenMode)
</ins><span class="cx"> {
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h (195486 => 195487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h 2016-01-22 23:25:35 UTC (rev 195486)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h 2016-01-22 23:26:42 UTC (rev 195487)
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> virtual void scrollRectIntoView(const WebCore::IntRect&) const { }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span><del>- virtual bool supportsVideoFullscreen();
</del><ins>+ virtual bool supportsVideoFullscreen(WebCore::HTMLMediaElementEnums::VideoFullscreenMode);
</ins><span class="cx"> virtual void enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&);
</span><span class="cx"> virtual void exitVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (195486 => 195487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-01-22 23:25:35 UTC (rev 195486)
+++ trunk/Source/WebKit2/ChangeLog 2016-01-22 23:26:42 UTC (rev 195487)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-01-17 Ada Chan <adachan@apple.com>
+
+ Add a mode parameter to MediaControllerInterface::supportsFullscreen() and ChromeClient::supportsVideoFullscreen().
+ https://bugs.webkit.org/show_bug.cgi?id=153220
+
+ Reviewed by Eric Carlson.
+
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::supportsVideoFullscreen):
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+
</ins><span class="cx"> 2016-01-22 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Reproducible "Unhanded web process message 'WebUserContentController:AddUserScripts'" and friends
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (195486 => 195487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2016-01-22 23:25:35 UTC (rev 195486)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2016-01-22 23:26:42 UTC (rev 195487)
</span><span class="lines">@@ -850,7 +850,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-bool WebChromeClient::supportsVideoFullscreen()
</del><ins>+bool WebChromeClient::supportsVideoFullscreen(WebCore::HTMLMediaElementEnums::VideoFullscreenMode)
</ins><span class="cx"> {
</span><span class="cx"> return m_page->videoFullscreenManager()->supportsVideoFullscreen();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (195486 => 195487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2016-01-22 23:25:35 UTC (rev 195486)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2016-01-22 23:26:42 UTC (rev 195487)
</span><span class="lines">@@ -243,7 +243,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- virtual bool supportsVideoFullscreen() override;
</del><ins>+ virtual bool supportsVideoFullscreen(WebCore::HTMLMediaElementEnums::VideoFullscreenMode) override;
</ins><span class="cx"> virtual void enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&, WebCore::HTMLMediaElementEnums::VideoFullscreenMode) override;
</span><span class="cx"> virtual void exitVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&) override;
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>