Changeset 116727 in webkit

Timestamp:

May 10, 2012 9:27:19 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

split MediaPlayer::enterFullscreen into 2 seperate functions
​https://bugs.webkit.org/show_bug.cgi?id=86052

Patch by Min Qin <​qinmin@google.com> on 2012-05-10
Reviewed by Benjamin Poulain.

Source/WebCore:

It is confusing that enterFullscreen returns a boolean while exitFullscreen does
not do the same. And ios does not need the return value.
So remove the return value on enterFullscreen and make a seperate canEnterFullscreen()
function for android.
No tests as there are no behavior change, just refactoring.

• platform/graphics/MediaPlayer.cpp:

(WebCore::MediaPlayer::enterFullscreen):
(WebCore):
(WebCore::MediaPlayer::canEnterFullscreen):

• platform/graphics/MediaPlayer.h:

(MediaPlayer):

• platform/graphics/MediaPlayerPrivate.h:

(WebCore::MediaPlayerPrivateInterface::enterFullscreen):
(MediaPlayerPrivateInterface):
(WebCore::MediaPlayerPrivateInterface::canEnterFullscreen):

Source/WebKit/chromium:

It is confusing that enterFullscreen returns a boolean while exitFullscreen does
not do the same. And ios does not need the return value.
So remove the return value on enterFullscreen and make a seperate canEnterFullscreen()
function for android.
No behavior change, just refactoring.

• public/WebMediaPlayer.h:

(WebMediaPlayer):
(WebKit::WebMediaPlayer::enterFullscreen):
(WebKit::WebMediaPlayer::canEnterFullscreen):

• src/WebMediaPlayerClientImpl.cpp:

(WebKit::WebMediaPlayerClientImpl::enterFullscreen):
(WebKit):
(WebKit::WebMediaPlayerClientImpl::exitFullscreen):

• src/WebMediaPlayerClientImpl.h:

(WebMediaPlayerClientImpl):

• src/WebViewImpl.cpp:

(WebKit::WebViewImpl::enterFullScreenForElement):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/MediaPlayer.cpp (modified) (2 diffs)
• WebCore/platform/graphics/MediaPlayer.h (modified) (1 diff)
• WebCore/platform/graphics/MediaPlayerPrivate.h (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/public/WebMediaPlayer.h (modified) (1 diff)
• WebKit/chromium/src/WebMediaPlayerClientImpl.cpp (modified) (2 diffs)
• WebKit/chromium/src/WebMediaPlayerClientImpl.h (modified) (1 diff)
• WebKit/chromium/src/WebViewImpl.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-10  Min Qin  <qinmin@google.com>
+
+        split MediaPlayer::enterFullscreen into 2 seperate functions
+        https://bugs.webkit.org/show_bug.cgi?id=86052
+
+        Reviewed by Benjamin Poulain.
+
+        It is confusing that enterFullscreen returns a boolean while exitFullscreen does
+        not do the same. And ios does not need the return value.
+        So remove the return value on enterFullscreen and make a seperate canEnterFullscreen()
+        function for android.
+        No tests as there are no behavior change, just refactoring.
+
+        * platform/graphics/MediaPlayer.cpp:
+        (WebCore::MediaPlayer::enterFullscreen):
+        (WebCore):
+        (WebCore::MediaPlayer::canEnterFullscreen):
+        * platform/graphics/MediaPlayer.h:
+        (MediaPlayer):
+        * platform/graphics/MediaPlayerPrivate.h:
+        (WebCore::MediaPlayerPrivateInterface::enterFullscreen):
+        (MediaPlayerPrivateInterface):
+        (WebCore::MediaPlayerPrivateInterface::canEnterFullscreen):
+
 2012-05-10  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp

@@ -771 +771 @@
 
 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO) || USE(NATIVE_FULLSCREEN_VIDEO)
-bool MediaPlayer::enterFullscreen() const
-{
-    return m_private->enterFullscreen();
+void MediaPlayer::enterFullscreen()
+{
+    m_private->enterFullscreen();
 }
 
@@ -779 +779 @@
 {
     m_private->exitFullscreen();
+}
+#endif
+
+#if USE(NATIVE_FULLSCREEN_VIDEO)
+bool MediaPlayer::canEnterFullscreen() const
+{
+    return m_private->canEnterFullscreen();
 }
 #endif

trunk/Source/WebCore/platform/graphics/MediaPlayer.h

@@ -328 +328 @@
 
 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO) || USE(NATIVE_FULLSCREEN_VIDEO)
-    bool enterFullscreen() const;
+    void enterFullscreen();
     void exitFullscreen();
+#endif
+
+#if USE(NATIVE_FULLSCREEN_VIDEO)
+    bool canEnterFullscreen() const;
 #endif
 

trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h

@@ -119 +119 @@
 
 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO) || USE(NATIVE_FULLSCREEN_VIDEO)
-    virtual bool enterFullscreen() const { return false; }
+    virtual void enterFullscreen() const { }
     virtual void exitFullscreen() { }
+#endif
+
+#if USE(NATIVE_FULLSCREEN_VIDEO)
+    virtual bool canEnterFullscreen() const { return false; }
 #endif
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-05-10  Min Qin  <qinmin@google.com>
+
+        split MediaPlayer::enterFullscreen into 2 seperate functions
+        https://bugs.webkit.org/show_bug.cgi?id=86052
+
+        Reviewed by Benjamin Poulain.
+
+        It is confusing that enterFullscreen returns a boolean while exitFullscreen does
+        not do the same. And ios does not need the return value.
+        So remove the return value on enterFullscreen and make a seperate canEnterFullscreen()
+        function for android.
+        No behavior change, just refactoring.
+
+        * public/WebMediaPlayer.h:
+        (WebMediaPlayer):
+        (WebKit::WebMediaPlayer::enterFullscreen):
+        (WebKit::WebMediaPlayer::canEnterFullscreen):
+        * src/WebMediaPlayerClientImpl.cpp:
+        (WebKit::WebMediaPlayerClientImpl::enterFullscreen):
+        (WebKit):
+        (WebKit::WebMediaPlayerClientImpl::exitFullscreen):
+        * src/WebMediaPlayerClientImpl.h:
+        (WebMediaPlayerClientImpl):
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::enterFullScreenForElement):
+
 2012-05-10  Hajime Morrita  <morrita@google.com>
 

trunk/Source/WebKit/chromium/public/WebMediaPlayer.h

@@ -185 +185 @@
     virtual MediaKeyException cancelKeyRequest(const WebString& keySystem, const WebString& sessionId) { return MediaKeyExceptionKeySystemNotSupported; }
 
-    // Instuct WebMediaPlayer to enter/exit fullscreen.
+    // Instruct WebMediaPlayer to enter/exit fullscreen.
+    virtual void enterFullscreen() { }
+    virtual void exitFullscreen() { }
     // Returns true if the player can enter fullscreen.
-    virtual bool enterFullscreen() { return false; }
-    virtual void exitFullscreen() { }
+    virtual bool canEnterFullscreen() const { return false; }
 };
 

trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp

@@ -341 +341 @@
 
 #if USE(NATIVE_FULLSCREEN_VIDEO)
-bool WebMediaPlayerClientImpl::enterFullscreen() const
-{
-    if (m_webMediaPlayer)
-        return m_webMediaPlayer->enterFullscreen();
-    return false;
+bool WebMediaPlayerClientImpl::enterFullscreen()
+{
+    if (m_webMediaPlayer)
+        m_webMediaPlayer->enterFullscreen();
 }
 
@@ -352 +351 @@
     if (m_webMediaPlayer)
         m_webMediaPlayer->exitFullscreen();
+}
+
+bool WebMediaPlayerClientImpl::canEnterFullscreen() const
+{
+    return m_webMediaPlayer && m_webMediaPlayer->canEnterFullscreen();
 }
 #endif

trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h

@@ -136 +136 @@
     virtual unsigned videoDecodedByteCount() const;
 #if USE(NATIVE_FULLSCREEN_VIDEO)
-    virtual bool enterFullscreen() const;
+    virtual void enterFullscreen();
     virtual void exitFullscreen();
+    virtual bool canEnterFullscreen() const;
 #endif
 

trunk/Source/WebKit/chromium/src/WebViewImpl.cpp

@@ -1603 +1603 @@
     if (element && element->isMediaElement()) {
         HTMLMediaElement* mediaElement = static_cast<HTMLMediaElement*>(element);
-        if (mediaElement->player() && mediaElement->player()->enterFullscreen())
+        if (mediaElement->player() && mediaElement->player()->canEnterFullscreen()) {
+            mediaElement->player()->enterFullscreen();
             m_provisionalFullScreenElement = element;
+        }
         return;
     }