Title: [195487] trunk/Source
Revision
195487
Author
[email protected]
Date
2016-01-22 15:26:42 -0800 (Fri, 22 Jan 2016)

Log Message

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:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (195486 => 195487)


--- 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)
@@ -1,3 +1,58 @@
+2016-01-17  Ada Chan  <[email protected]>
+
+        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.
+
 2016-01-22  Chris Dumez  <[email protected]>
 
         Document.URL / Document.documentURI should return "about:blank" instead of empty string / null

Modified: trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp (195486 => 195487)


--- 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)
@@ -202,7 +202,7 @@
 
 bool MediaControlsHost::supportsFullscreen()
 {
-    return m_mediaElement->supportsFullscreen();
+    return m_mediaElement->supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenModeStandard);
 }
 
 bool MediaControlsHost::userGestureRequired() const

Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (195486 => 195487)


--- 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)
@@ -5291,7 +5291,7 @@
         return;
 
 #if ENABLE(FULLSCREEN_API)
-    if (document().settings() && document().settings()->fullScreenEnabled()) {
+    if (mode == VideoFullscreenModeStandard && document().settings() && document().settings()->fullScreenEnabled()) {
         document().requestFullScreenForElement(this, 0, Document::ExemptIFrameAllowFullScreenRequirement);
         return;
     }
@@ -5302,7 +5302,7 @@
         mediaControls()->enteredFullscreen();
     if (document().page() && is<HTMLVideoElement>(*this)) {
         HTMLVideoElement& asVideo = downcast<HTMLVideoElement>(*this);
-        if (document().page()->chrome().client().supportsVideoFullscreen()) {
+        if (document().page()->chrome().client().supportsVideoFullscreen(m_videoFullscreenMode)) {
             document().page()->chrome().client().enterVideoFullscreenForVideoElement(asVideo, m_videoFullscreenMode);
             scheduleEvent(eventNames().webkitbeginfullscreenEvent);
         }
@@ -5319,13 +5319,15 @@
     LOG(Media, "HTMLMediaElement::exitFullscreen(%p)", this);
 
 #if ENABLE(FULLSCREEN_API)
-    if (document().settings() && document().settings()->fullScreenEnabled()) {
-        if (document().webkitIsFullScreen() && document().webkitCurrentFullScreenElement() == this)
+    if (document().settings() && document().settings()->fullScreenEnabled() && document().webkitCurrentFullScreenElement() == this) {
+        if (document().webkitIsFullScreen())
             document().webkitCancelFullScreen();
         return;
     }
 #endif
+
     ASSERT(m_videoFullscreenMode != VideoFullscreenModeNone);
+    VideoFullscreenMode oldVideoFullscreenMode = m_videoFullscreenMode;
     fullscreenModeChanged(VideoFullscreenModeNone);
     if (hasMediaControls())
         mediaControls()->exitedFullscreen();
@@ -5333,7 +5335,7 @@
         if (m_mediaSession->requiresFullscreenForVideoPlayback(*this))
             pauseInternal();
 
-        if (document().page()->chrome().client().supportsVideoFullscreen()) {
+        if (document().page()->chrome().client().supportsVideoFullscreen(oldVideoFullscreenMode)) {
             document().page()->chrome().client().exitVideoFullscreenForVideoElement(downcast<HTMLVideoElement>(*this));
             scheduleEvent(eventNames().webkitendfullscreenEvent);
         }

Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (195486 => 195487)


--- 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)
@@ -120,7 +120,7 @@
     WEBCORE_EXPORT virtual void returnToRealtime() override;
 
     // Eventually overloaded in HTMLVideoElement
-    virtual bool supportsFullscreen() const override { return false; };
+    virtual bool supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenMode) const override { return false; };
 
     virtual bool supportsScanning() const override;
 

Modified: trunk/Source/WebCore/html/HTMLVideoElement.cpp (195486 => 195487)


--- 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)
@@ -144,7 +144,7 @@
 
 }
 
-bool HTMLVideoElement::supportsFullscreen() const
+bool HTMLVideoElement::supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenMode videoFullscreenMode) const
 {
     Page* page = document().page();
     if (!page) 
@@ -154,20 +154,21 @@
         return false;
 
 #if PLATFORM(IOS)
+    UNUSED_PARAM(videoFullscreenMode);
     // Fullscreen implemented by player.
     return true;
 #else
 #if ENABLE(FULLSCREEN_API)
     // If the full screen API is enabled and is supported for the current element
     // do not require that the player has a video track to enter full screen.
-    if (page->chrome().client().supportsFullScreenForElement(this, false))
+    if (videoFullscreenMode == HTMLMediaElementEnums::VideoFullscreenModeStandard && page->chrome().client().supportsFullScreenForElement(this, false))
         return true;
 #endif
 
     if (!player()->hasVideo())
         return false;
 
-    return page->chrome().client().supportsVideoFullscreen();
+    return page->chrome().client().supportsVideoFullscreen(videoFullscreenMode);
 #endif // PLATFORM(IOS)
 }
 
@@ -279,7 +280,7 @@
 
     // Generate an exception if this isn't called in response to a user gesture, or if the 
     // element does not support fullscreen.
-    if (!mediaSession().fullscreenPermitted(*this) || !supportsFullscreen()) {
+    if (!mediaSession().fullscreenPermitted(*this) || !supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenModeStandard)) {
         ec = INVALID_STATE_ERR;
         return;
     }
@@ -295,7 +296,7 @@
 
 bool HTMLVideoElement::webkitSupportsFullscreen()
 {
-    return supportsFullscreen();
+    return supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenModeStandard);
 }
 
 bool HTMLVideoElement::webkitDisplayingFullscreen()
@@ -371,7 +372,7 @@
 bool HTMLVideoElement::webkitSupportsPresentationMode(const String& mode) const
 {
     if (mode == presentationModeFullscreen())
-        return mediaSession().fullscreenPermitted(*this) && supportsFullscreen();
+        return mediaSession().fullscreenPermitted(*this) && supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenModeStandard);
 
     if (mode == presentationModePictureInPicture()) {
 #if PLATFORM(COCOA)
@@ -379,7 +380,7 @@
             return false;
 #endif
 
-        return mediaSession().allowsPictureInPicture(*this) && supportsFullscreen();
+        return mediaSession().allowsPictureInPicture(*this) && supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenModePictureInPicture);
     }
 
     if (mode == presentationModeInline())
@@ -424,7 +425,7 @@
         return;
     }
 
-    if (!mediaSession().fullscreenPermitted(*this) || !supportsFullscreen())
+    if (!mediaSession().fullscreenPermitted(*this) || !supportsFullscreen(mode))
         return;
 
     enterFullscreen(mode);

Modified: trunk/Source/WebCore/html/HTMLVideoElement.h (195486 => 195487)


--- 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)
@@ -96,7 +96,7 @@
     virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) override;
     virtual bool isVideo() const override { return true; }
     virtual bool hasVideo() const override { return player() && player()->hasVideo(); }
-    virtual bool supportsFullscreen() const override;
+    virtual bool supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenMode) const override;
     virtual bool isURLAttribute(const Attribute&) const override;
     virtual const AtomicString& imageSourceURL() const override;
 

Modified: trunk/Source/WebCore/html/MediaController.h (195486 => 195487)


--- 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)
@@ -84,7 +84,7 @@
     enum PlaybackState { WAITING, PLAYING, ENDED };
     const AtomicString& playbackState() const;
 
-    virtual bool supportsFullscreen() const override { return false; }
+    virtual bool supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenMode) const override { return false; }
     virtual bool isFullscreen() const override { return false; }
     virtual void enterFullscreen() override { }
 

Modified: trunk/Source/WebCore/html/MediaControllerInterface.h (195486 => 195487)


--- 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)
@@ -70,7 +70,7 @@
     virtual ReadyState readyState() const = 0;
 
     // MediaControlElements:
-    virtual bool supportsFullscreen() const = 0;
+    virtual bool supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenMode) const = 0;
     virtual bool isFullscreen() const = 0;
     virtual void enterFullscreen() = 0;
 

Modified: trunk/Source/WebCore/html/shadow/MediaControls.cpp (195486 => 195487)


--- 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)
@@ -116,7 +116,7 @@
     refreshClosedCaptionsButtonVisibility();
 
     if (m_fullScreenButton) {
-        if (m_mediaController->supportsFullscreen() && m_mediaController->hasVideo())
+        if (m_mediaController->supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenModeStandard) && m_mediaController->hasVideo())
             m_fullScreenButton->show();
         else
             m_fullScreenButton->hide();

Modified: trunk/Source/WebCore/html/shadow/MediaControlsApple.cpp (195486 => 195487)


--- 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)
@@ -307,7 +307,7 @@
 
     updateStatusDisplay();
 
-    if (m_mediaController->supportsFullscreen())
+    if (m_mediaController->supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenModeStandard))
         m_fullScreenButton->show();
     else
         m_fullScreenButton->hide();

Modified: trunk/Source/WebCore/page/ChromeClient.h (195486 => 195487)


--- 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)
@@ -338,7 +338,7 @@
     virtual GraphicsDeviceAdapter* graphicsDeviceAdapter() const { return 0; }
 #endif
 
-    virtual bool supportsVideoFullscreen() { return false; }
+    virtual bool supportsVideoFullscreen(HTMLMediaElementEnums::VideoFullscreenMode) { return false; }
 #if ENABLE(VIDEO)
     virtual void enterVideoFullscreenForVideoElement(HTMLVideoElement&, HTMLMediaElementEnums::VideoFullscreenMode) { }
 #endif

Modified: trunk/Source/WebCore/rendering/HitTestResult.cpp (195486 => 195487)


--- 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)
@@ -406,7 +406,7 @@
 {
 #if ENABLE(VIDEO)
     HTMLMediaElement* mediaElt(mediaElement());
-    return is<HTMLVideoElement>(mediaElt) && mediaElt->supportsFullscreen();
+    return is<HTMLVideoElement>(mediaElt) && mediaElt->supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenModeStandard);
 #else
     return false;
 #endif
@@ -456,7 +456,7 @@
 {
 #if ENABLE(VIDEO)
     if (HTMLMediaElement* mediaElement = this->mediaElement()) {
-        if (mediaElement->isVideo() && mediaElement->supportsFullscreen()) {
+        if (mediaElement->isVideo() && mediaElement->supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenModeStandard)) {
             UserGestureIndicator indicator(DefinitelyProcessingUserGesture, &mediaElement->document());
             mediaElement->toggleFullscreenState();
         }
@@ -470,7 +470,7 @@
     HTMLMediaElement* mediaElement(this->mediaElement());
     if (is<HTMLVideoElement>(mediaElement)) {
         HTMLVideoElement& videoElement = downcast<HTMLVideoElement>(*mediaElement);
-        if (!videoElement.isFullscreen() && mediaElement->supportsFullscreen()) {
+        if (!videoElement.isFullscreen() && mediaElement->supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenModeStandard)) {
             UserGestureIndicator indicator(DefinitelyProcessingUserGesture, &mediaElement->document());
             videoElement.enterFullscreen();
         }

Modified: trunk/Source/WebKit/mac/ChangeLog (195486 => 195487)


--- 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)
@@ -1,3 +1,14 @@
+2016-01-17  Ada Chan  <[email protected]>
+
+        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):
+
 2016-01-22  Darin Adler  <[email protected]>
 
         Reduce use of equalIgnoringCase to just ignore ASCII case

Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h (195486 => 195487)


--- 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)
@@ -175,7 +175,7 @@
     }
 
 #if ENABLE(VIDEO)
-    virtual bool supportsVideoFullscreen() override;
+    virtual bool supportsVideoFullscreen(WebCore::HTMLMediaElementEnums::VideoFullscreenMode) override;
     virtual void enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&, WebCore::HTMLMediaElementEnums::VideoFullscreenMode) override;
     virtual void exitVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&) override;
 #endif

Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm (195486 => 195487)


--- 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)
@@ -910,7 +910,7 @@
 
 #if ENABLE(VIDEO)
 
-bool WebChromeClient::supportsVideoFullscreen()
+bool WebChromeClient::supportsVideoFullscreen(HTMLMediaElementEnums::VideoFullscreenMode)
 {
 #if PLATFORM(IOS)
     if (!Settings::avKitEnabled())

Modified: trunk/Source/WebKit/win/ChangeLog (195486 => 195487)


--- 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)
@@ -1,3 +1,14 @@
+2016-01-17  Ada Chan  <[email protected]>
+
+        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:
+
 2016-01-22  Youenn Fablet  <[email protected]>
 
         Remove PassRefPtr from ResourceRequest and FormData

Modified: trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp (195486 => 195487)


--- 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)
@@ -747,7 +747,7 @@
 
 #if ENABLE(VIDEO)
 
-bool WebChromeClient::supportsVideoFullscreen()
+bool WebChromeClient::supportsVideoFullscreen(HTMLMediaElementEnums::VideoFullscreenMode)
 {
     return true;
 }

Modified: trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.h (195486 => 195487)


--- 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)
@@ -139,7 +139,7 @@
     virtual void scrollRectIntoView(const WebCore::IntRect&) const { }
 
 #if ENABLE(VIDEO)
-    virtual bool supportsVideoFullscreen();
+    virtual bool supportsVideoFullscreen(WebCore::HTMLMediaElementEnums::VideoFullscreenMode);
     virtual void enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&);
     virtual void exitVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&);
 #endif

Modified: trunk/Source/WebKit2/ChangeLog (195486 => 195487)


--- 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)
@@ -1,3 +1,14 @@
+2016-01-17  Ada Chan  <[email protected]>
+
+        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:
+
 2016-01-22  Tim Horton  <[email protected]>
 
         Reproducible "Unhanded web process message 'WebUserContentController:AddUserScripts'" and friends

Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (195486 => 195487)


--- 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)
@@ -850,7 +850,7 @@
 #endif
 
 #if PLATFORM(IOS)
-bool WebChromeClient::supportsVideoFullscreen()
+bool WebChromeClient::supportsVideoFullscreen(WebCore::HTMLMediaElementEnums::VideoFullscreenMode)
 {
     return m_page->videoFullscreenManager()->supportsVideoFullscreen();
 }

Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (195486 => 195487)


--- 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)
@@ -243,7 +243,7 @@
 #endif
 
 #if PLATFORM(IOS)
-    virtual bool supportsVideoFullscreen() override;
+    virtual bool supportsVideoFullscreen(WebCore::HTMLMediaElementEnums::VideoFullscreenMode) override;
     virtual void enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&, WebCore::HTMLMediaElementEnums::VideoFullscreenMode) override;
     virtual void exitVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&) override;
 #endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to