Diff
Modified: trunk/Source/WebCore/ChangeLog (116735 => 116736)
--- trunk/Source/WebCore/ChangeLog 2012-05-11 07:16:26 UTC (rev 116735)
+++ trunk/Source/WebCore/ChangeLog 2012-05-11 07:33:16 UTC (rev 116736)
@@ -1,5 +1,23 @@
2012-05-11 Sheriff Bot <[email protected]>
+ Unreviewed, rolling out r116727.
+ http://trac.webkit.org/changeset/116727
+ https://bugs.webkit.org/show_bug.cgi?id=86181
+
+ Build error on Chromium-Android (Requested by tkent on
+ #webkit).
+
+ * platform/graphics/MediaPlayer.cpp:
+ (WebCore::MediaPlayer::enterFullscreen):
+ (WebCore):
+ * platform/graphics/MediaPlayer.h:
+ (MediaPlayer):
+ * platform/graphics/MediaPlayerPrivate.h:
+ (WebCore::MediaPlayerPrivateInterface::enterFullscreen):
+ (MediaPlayerPrivateInterface):
+
+2012-05-11 Sheriff Bot <[email protected]>
+
Unreviewed, rolling out r116731.
http://trac.webkit.org/changeset/116731
https://bugs.webkit.org/show_bug.cgi?id=86178
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (116735 => 116736)
--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2012-05-11 07:16:26 UTC (rev 116735)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2012-05-11 07:33:16 UTC (rev 116736)
@@ -770,9 +770,9 @@
#endif
#if ENABLE(PLUGIN_PROXY_FOR_VIDEO) || USE(NATIVE_FULLSCREEN_VIDEO)
-void MediaPlayer::enterFullscreen()
+bool MediaPlayer::enterFullscreen() const
{
- m_private->enterFullscreen();
+ return m_private->enterFullscreen();
}
void MediaPlayer::exitFullscreen()
@@ -781,13 +781,6 @@
}
#endif
-#if USE(NATIVE_FULLSCREEN_VIDEO)
-bool MediaPlayer::canEnterFullscreen() const
-{
- return m_private->canEnterFullscreen();
-}
-#endif
-
#if USE(ACCELERATED_COMPOSITING)
void MediaPlayer::acceleratedRenderingStateChanged()
{
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (116735 => 116736)
--- trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2012-05-11 07:16:26 UTC (rev 116735)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2012-05-11 07:33:16 UTC (rev 116736)
@@ -327,14 +327,10 @@
#endif
#if ENABLE(PLUGIN_PROXY_FOR_VIDEO) || USE(NATIVE_FULLSCREEN_VIDEO)
- void enterFullscreen();
+ bool enterFullscreen() const;
void exitFullscreen();
#endif
-#if USE(NATIVE_FULLSCREEN_VIDEO)
- bool canEnterFullscreen() const;
-#endif
-
#if USE(ACCELERATED_COMPOSITING)
// whether accelerated rendering is supported by the media engine for the current media.
bool supportsAcceleratedRendering() const;
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h (116735 => 116736)
--- trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2012-05-11 07:16:26 UTC (rev 116735)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2012-05-11 07:33:16 UTC (rev 116736)
@@ -118,14 +118,10 @@
#endif
#if ENABLE(PLUGIN_PROXY_FOR_VIDEO) || USE(NATIVE_FULLSCREEN_VIDEO)
- virtual void enterFullscreen() const { }
+ virtual bool enterFullscreen() const { return false; }
virtual void exitFullscreen() { }
#endif
-#if USE(NATIVE_FULLSCREEN_VIDEO)
- virtual bool canEnterFullscreen() const { return false; }
-#endif
-
#if USE(ACCELERATED_COMPOSITING)
// whether accelerated rendering is supported by the media engine for the current media.
virtual bool supportsAcceleratedRendering() const { return false; }
Modified: trunk/Source/WebKit/chromium/ChangeLog (116735 => 116736)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-05-11 07:16:26 UTC (rev 116735)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-05-11 07:33:16 UTC (rev 116736)
@@ -1,5 +1,26 @@
2012-05-11 Sheriff Bot <[email protected]>
+ Unreviewed, rolling out r116727.
+ http://trac.webkit.org/changeset/116727
+ https://bugs.webkit.org/show_bug.cgi?id=86181
+
+ Build error on Chromium-Android (Requested by tkent on
+ #webkit).
+
+ * public/WebMediaPlayer.h:
+ (WebMediaPlayer):
+ (WebKit::WebMediaPlayer::enterFullscreen):
+ (WebKit::WebMediaPlayer::exitFullscreen):
+ * src/WebMediaPlayerClientImpl.cpp:
+ (WebKit::WebMediaPlayerClientImpl::enterFullscreen):
+ (WebKit::WebMediaPlayerClientImpl::exitFullscreen):
+ * src/WebMediaPlayerClientImpl.h:
+ (WebMediaPlayerClientImpl):
+ * src/WebViewImpl.cpp:
+ (WebKit::WebViewImpl::enterFullScreenForElement):
+
+2012-05-11 Sheriff Bot <[email protected]>
+
Unreviewed, rolling out r116731.
http://trac.webkit.org/changeset/116731
https://bugs.webkit.org/show_bug.cgi?id=86178
Modified: trunk/Source/WebKit/chromium/public/WebMediaPlayer.h (116735 => 116736)
--- trunk/Source/WebKit/chromium/public/WebMediaPlayer.h 2012-05-11 07:16:26 UTC (rev 116735)
+++ trunk/Source/WebKit/chromium/public/WebMediaPlayer.h 2012-05-11 07:33:16 UTC (rev 116736)
@@ -184,11 +184,10 @@
virtual MediaKeyException addKey(const WebString& keySystem, const unsigned char* key, unsigned keyLength, const unsigned char* initData, unsigned initDataLength, const WebString& sessionId) { return MediaKeyExceptionKeySystemNotSupported; }
virtual MediaKeyException cancelKeyRequest(const WebString& keySystem, const WebString& sessionId) { return MediaKeyExceptionKeySystemNotSupported; }
- // Instruct WebMediaPlayer to enter/exit fullscreen.
- virtual void enterFullscreen() { }
- virtual void exitFullscreen() { }
+ // Instuct WebMediaPlayer to enter/exit fullscreen.
// Returns true if the player can enter fullscreen.
- virtual bool canEnterFullscreen() const { return false; }
+ virtual bool enterFullscreen() { return false; }
+ virtual void exitFullscreen() { }
};
} // namespace WebKit
Modified: trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp (116735 => 116736)
--- trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp 2012-05-11 07:16:26 UTC (rev 116735)
+++ trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp 2012-05-11 07:33:16 UTC (rev 116736)
@@ -340,10 +340,11 @@
}
#if USE(NATIVE_FULLSCREEN_VIDEO)
-bool WebMediaPlayerClientImpl::enterFullscreen()
+bool WebMediaPlayerClientImpl::enterFullscreen() const
{
if (m_webMediaPlayer)
- m_webMediaPlayer->enterFullscreen();
+ return m_webMediaPlayer->enterFullscreen();
+ return false;
}
void WebMediaPlayerClientImpl::exitFullscreen()
@@ -351,11 +352,6 @@
if (m_webMediaPlayer)
m_webMediaPlayer->exitFullscreen();
}
-
-bool WebMediaPlayerClientImpl::canEnterFullscreen() const
-{
- return m_webMediaPlayer && m_webMediaPlayer->canEnterFullscreen();
-}
#endif
#if ENABLE(MEDIA_SOURCE)
Modified: trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h (116735 => 116736)
--- trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h 2012-05-11 07:16:26 UTC (rev 116735)
+++ trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h 2012-05-11 07:33:16 UTC (rev 116736)
@@ -135,9 +135,8 @@
virtual unsigned audioDecodedByteCount() const;
virtual unsigned videoDecodedByteCount() const;
#if USE(NATIVE_FULLSCREEN_VIDEO)
- virtual void enterFullscreen();
+ virtual bool enterFullscreen() const;
virtual void exitFullscreen();
- virtual bool canEnterFullscreen() const;
#endif
#if ENABLE(WEB_AUDIO)
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (116735 => 116736)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-05-11 07:16:26 UTC (rev 116735)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-05-11 07:33:16 UTC (rev 116736)
@@ -1602,10 +1602,8 @@
#if USE(NATIVE_FULLSCREEN_VIDEO)
if (element && element->isMediaElement()) {
HTMLMediaElement* mediaElement = static_cast<HTMLMediaElement*>(element);
- if (mediaElement->player() && mediaElement->player()->canEnterFullscreen()) {
- mediaElement->player()->enterFullscreen();
+ if (mediaElement->player() && mediaElement->player()->enterFullscreen())
m_provisionalFullScreenElement = element;
- }
return;
}
#endif
