Commit aceccc44 authored by jer.noble@apple.com's avatar jer.noble@apple.com

MediaPlayerPrivateAVFoundation should report that it supportsFullScreen()

https://bugs.webkit.org/show_bug.cgi?id=57249

Reviewed by Darin Adler.

Source/WebCore:

* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
(WebCore::MediaPlayerPrivateAVFoundation::supportsFullscreen):
* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:

LayoutTests:

* platform/mac/media/controls-strict-expected.txt:
* platform/mac/media/video-controls-rendering-expected.txt:
* platform/mac/media/video-display-toggle-expected.txt:
* platform/mac/media/video-no-audio-expected.txt:
* platform/mac/media/video-zoom-controls-expected.txt:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@82167 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 730428cf
2011-03-28 Jer Noble <jer.noble@apple.com>
Reviewed by Darin Adler.
MediaPlayerPrivateAVFoundation should report that it supportsFullScreen()
https://bugs.webkit.org/show_bug.cgi?id=57249
* platform/mac/media/controls-strict-expected.txt:
* platform/mac/media/video-controls-rendering-expected.txt:
* platform/mac/media/video-display-toggle-expected.txt:
* platform/mac/media/video-no-audio-expected.txt:
* platform/mac/media/video-zoom-controls-expected.txt:
2011-03-28 Jer Noble <jer.noble@apple.com>
Reviewed by Darin Adler.
AVFoundation can indeed support full screen.
MediaPlayerPrivateAVFoundation should report that it supportsFullScreen()
https://bugs.webkit.org/show_bug.cgi?id=57249
* platform/mac/media/controls-strict-expected.txt:
* platform/mac/media/video-controls-rendering-expected.txt:
* platform/mac/media/video-display-toggle-expected.txt:
* platform/mac/media/video-no-audio-expected.txt:
* platform/mac/media/video-zoom-controls-expected.txt:
2011-03-28 Andy Estes <aestes@apple.com>
Check in failing results for embed-prefers-plugins-for-images.html on Leopard.
......
......@@ -12,12 +12,22 @@ layer at (8,50) size 320x240
RenderVideo {VIDEO} at (0,0) size 320x240
layer at (8,50) size 320x240
RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
layer at (8,274) size 320x16
RenderFlexibleBox (positioned) {DIV} at (0,224) size 320x16
RenderButton {INPUT} at (0,0) size 16x16
RenderButton {INPUT} at (16,0) size 16x16
RenderFlexibleBox {DIV} at (32,0) size 256x16
RenderSlider {INPUT} at (0,0) size 256x16
RenderBlock {DIV} at (2,1) size 13x14
RenderButton {INPUT} at (288,0) size 16x16
RenderButton {INPUT} at (304,0) size 16x16
layer at (8,265) size 320x25
RenderFlexibleBox (positioned) {DIV} at (0,215) size 320x25
RenderButton {INPUT} at (6,3) size 18x18
RenderButton {INPUT} at (32,4) size 16x16
RenderFlexibleBox {DIV} at (49,5) size 216x15
RenderSlider {INPUT} at (45,2) size 126x13
RenderBlock {DIV} at (0,2) size 10x8
RenderButton {INPUT} at (297,4) size 16x16
RenderButton {INPUT} at (267,6) size 14x12
layer at (57,272) size 45x11
RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
RenderBlock (anonymous) at (9,0) size 26x11
RenderText {#text} at (0,0) size 26x11
text run at (0,0) width 26: "00:00"
layer at (228,272) size 45x11
RenderFlexibleBox {DIV} at (171,2) size 45x11 [color=#FFFFFF]
RenderBlock (anonymous) at (7,0) size 31x11
RenderText {#text} at (0,0) size 31x11
text run at (0,0) width 31: "-00:06"
......@@ -17,36 +17,66 @@ layer at (8,282) size 320x240
RenderVideo {VIDEO} at (0,0) size 320x240
layer at (8,42) size 320x240
RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
layer at (8,266) size 320x16
RenderFlexibleBox (positioned) {DIV} at (0,224) size 320x16
RenderButton {INPUT} at (0,0) size 16x16
RenderButton {INPUT} at (16,0) size 16x16
RenderFlexibleBox {DIV} at (32,0) size 256x16
RenderSlider {INPUT} at (0,0) size 256x16
RenderBlock {DIV} at (2,1) size 13x14
RenderButton {INPUT} at (288,0) size 16x16
RenderButton {INPUT} at (304,0) size 16x16
layer at (8,257) size 320x25
RenderFlexibleBox (positioned) {DIV} at (0,215) size 320x25
RenderButton {INPUT} at (6,3) size 18x18
RenderButton {INPUT} at (32,4) size 16x16
RenderFlexibleBox {DIV} at (49,5) size 216x15
RenderSlider {INPUT} at (45,2) size 126x13
RenderBlock {DIV} at (0,2) size 10x8
RenderButton {INPUT} at (297,4) size 16x16
RenderButton {INPUT} at (267,6) size 14x12
layer at (57,264) size 45x11
RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
RenderBlock (anonymous) at (9,0) size 26x11
RenderText {#text} at (0,0) size 26x11
text run at (0,0) width 26: "00:00"
layer at (228,264) size 45x11
RenderFlexibleBox {DIV} at (171,2) size 45x11 [color=#FFFFFF]
RenderBlock (anonymous) at (7,0) size 31x11
RenderText {#text} at (0,0) size 31x11
text run at (0,0) width 31: "-00:06"
layer at (8,282) size 320x240
RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
layer at (8,506) size 320x16
RenderFlexibleBox (positioned) {DIV} at (0,224) size 320x16
RenderButton {INPUT} at (0,0) size 16x16
RenderButton {INPUT} at (16,0) size 16x16
RenderFlexibleBox {DIV} at (32,0) size 256x16
RenderSlider {INPUT} at (0,0) size 256x16
RenderBlock {DIV} at (2,1) size 13x14
RenderButton {INPUT} at (288,0) size 16x16
RenderButton {INPUT} at (304,0) size 16x16
layer at (8,497) size 320x25
RenderFlexibleBox (positioned) {DIV} at (0,215) size 320x25
RenderButton {INPUT} at (6,3) size 18x18
RenderButton {INPUT} at (32,4) size 16x16
RenderFlexibleBox {DIV} at (49,5) size 216x15
RenderSlider {INPUT} at (45,2) size 126x13
RenderBlock {DIV} at (0,2) size 10x8
RenderButton {INPUT} at (297,4) size 16x16
RenderButton {INPUT} at (267,6) size 14x12
layer at (57,504) size 45x11
RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
RenderBlock (anonymous) at (9,0) size 26x11
RenderText {#text} at (0,0) size 26x11
text run at (0,0) width 26: "00:00"
layer at (228,504) size 45x11
RenderFlexibleBox {DIV} at (171,2) size 45x11 [color=#FFFFFF]
RenderBlock (anonymous) at (7,0) size 31x11
RenderText {#text} at (0,0) size 31x11
text run at (0,0) width 31: "-00:06"
layer at (8,522) size 320x240
RenderVideo {VIDEO} at (8,522) size 320x240
layer at (8,522) size 320x240
RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
layer at (8,746) size 320x16
RenderFlexibleBox (positioned) {DIV} at (0,224) size 320x16
RenderButton {INPUT} at (0,0) size 16x16
RenderButton {INPUT} at (16,0) size 16x16
RenderFlexibleBox {DIV} at (32,0) size 256x16
RenderSlider {INPUT} at (0,0) size 256x16
RenderBlock {DIV} at (2,1) size 13x14
RenderButton {INPUT} at (288,0) size 16x16
RenderButton {INPUT} at (304,0) size 16x16
layer at (8,737) size 320x25
RenderFlexibleBox (positioned) {DIV} at (0,215) size 320x25
RenderButton {INPUT} at (6,3) size 18x18
RenderButton {INPUT} at (32,4) size 16x16
RenderFlexibleBox {DIV} at (49,5) size 216x15
RenderSlider {INPUT} at (45,2) size 126x13
RenderBlock {DIV} at (0,2) size 10x8
RenderButton {INPUT} at (297,4) size 16x16
RenderButton {INPUT} at (267,6) size 14x12
layer at (57,744) size 45x11
RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
RenderBlock (anonymous) at (9,0) size 26x11
RenderText {#text} at (0,0) size 26x11
text run at (0,0) width 26: "00:00"
layer at (228,744) size 45x11
RenderFlexibleBox {DIV} at (171,2) size 45x11 [color=#FFFFFF]
RenderBlock (anonymous) at (7,0) size 31x11
RenderText {#text} at (0,0) size 31x11
text run at (0,0) width 31: "-00:06"
......@@ -11,12 +11,22 @@ layer at (8,26) size 320x240
RenderVideo {VIDEO} at (0,18) size 320x240
layer at (8,26) size 320x240
RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
layer at (8,250) size 320x16
RenderFlexibleBox (positioned) {DIV} at (0,224) size 320x16
RenderButton {INPUT} at (0,0) size 16x16
RenderButton {INPUT} at (16,0) size 16x16
RenderFlexibleBox {DIV} at (32,0) size 256x16
RenderSlider {INPUT} at (0,0) size 256x16
RenderBlock {DIV} at (2,1) size 13x14
RenderButton {INPUT} at (288,0) size 16x16
RenderButton {INPUT} at (304,0) size 16x16
layer at (8,241) size 320x25
RenderFlexibleBox (positioned) {DIV} at (0,215) size 320x25
RenderButton {INPUT} at (6,3) size 18x18
RenderButton {INPUT} at (32,4) size 16x16
RenderFlexibleBox {DIV} at (49,5) size 216x15
RenderSlider {INPUT} at (45,2) size 126x13
RenderBlock {DIV} at (0,2) size 10x8
RenderButton {INPUT} at (297,4) size 16x16
RenderButton {INPUT} at (267,6) size 14x12
layer at (57,248) size 45x11
RenderFlexibleBox {DIV} at (0,2) size 45x11 [color=#FFFFFF]
RenderBlock (anonymous) at (9,0) size 26x11
RenderText {#text} at (0,0) size 26x11
text run at (0,0) width 26: "00:00"
layer at (228,248) size 45x11
RenderFlexibleBox {DIV} at (171,2) size 45x11 [color=#FFFFFF]
RenderBlock (anonymous) at (7,0) size 31x11
RenderText {#text} at (0,0) size 31x11
text run at (0,0) width 31: "-00:06"
......@@ -27,6 +27,6 @@ layer at (57,312) size 45x11
text run at (0,0) width 26: "00:00"
layer at (285,312) size 45x11
RenderFlexibleBox {DIV} at (228,2) size 45x11 [color=#FFFFFF]
RenderBlock (anonymous) at (6,0) size 32x11
RenderText {#text} at (0,0) size 32x11
text run at (0,0) width 32: "-00:09"
RenderBlock (anonymous) at (7,0) size 31x11
RenderText {#text} at (0,0) size 31x11
text run at (0,0) width 31: "-00:09"
......@@ -14,8 +14,8 @@ layer at (57,228) size 240x37
RenderFlexibleBox (positioned) {DIV} at (0,143) size 240x37
RenderButton {INPUT} at (9,4) size 27x27
RenderButton {INPUT} at (48,6) size 24x24
RenderFlexibleBox {DIV} at (73,1) size 86x34
RenderSlider {INPUT} at (0,9) size 86x19
RenderFlexibleBox {DIV} at (73,7) size 86x22
RenderSlider {INPUT} at (0,3) size 86x19
RenderBlock {DIV} at (0,3) size 15x12
RenderButton {INPUT} at (206,6) size 24x24
RenderButton {INPUT} at (162,9) size 21x18
......@@ -27,8 +27,8 @@ layer at (57,453) size 240x37
RenderFlexibleBox (positioned) {DIV} at (0,143) size 240x37
RenderButton {INPUT} at (9,4) size 27x27
RenderButton {INPUT} at (48,6) size 24x24
RenderFlexibleBox {DIV} at (73,1) size 86x34
RenderSlider {INPUT} at (0,9) size 86x19
RenderFlexibleBox {DIV} at (73,7) size 86x22
RenderSlider {INPUT} at (0,3) size 86x19
RenderBlock {DIV} at (0,3) size 15x12
RenderButton {INPUT} at (206,6) size 24x24
RenderButton {INPUT} at (162,9) size 21x18
2011-03-28 Jer Noble <jer.noble@apple.com>
Reviewed by Darin Adler.
MediaPlayerPrivateAVFoundation should report that it supportsFullScreen()
https://bugs.webkit.org/show_bug.cgi?id=57249
* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
(WebCore::MediaPlayerPrivateAVFoundation::supportsFullscreen):
* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
2011-03-28 Jer Noble <jer.noble@apple.com>
Reviewed by Darin Adler.
AVFoundation can indeed support full screen.
MediaPlayerPrivateAVFoundation should report that it supportsFullScreen()
https://bugs.webkit.org/show_bug.cgi?id=57249
* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
(WebCore::MediaPlayerPrivateAVFoundation::supportsFullscreen): Return true if using
the new full screen APIs.
* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
2011-03-28 Eric Carlson <eric.carlson@apple.com>
Reviewed by Darin Adler.
......@@ -384,6 +384,16 @@ void MediaPlayerPrivateAVFoundation::prepareForRendering()
m_player->mediaPlayerClient()->mediaPlayerRenderingModeChanged(m_player);
}
bool MediaPlayerPrivateAVFoundation::supportsFullscreen() const
{
#if ENABLE(FULLSCREEN_API)
return true;
#else
// FIXME: WebVideoFullscreenController assumes a QTKit/QuickTime media engine
return false;
#endif
}
void MediaPlayerPrivateAVFoundation::updateStates()
{
MediaPlayer::NetworkState oldNetworkState = m_networkState;
......
......@@ -141,8 +141,7 @@ protected:
virtual void prepareForRendering();
virtual float mediaTimeForTimeValue(float) const = 0;
// FIXME: WebVideoFullscreenController assumes a QTKit/QuickTime media engine
virtual bool supportsFullscreen() const { return false; }
virtual bool supportsFullscreen() const;
// Required interfaces for concrete derived classes.
virtual void createAVPlayerForURL(const String& url) = 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment