[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
eric.carlson at apple.com
eric.carlson at apple.com
Wed Apr 7 23:51:49 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 1c66dbd654960a83ea913f310e1c77a6161ad95c
Author: eric.carlson at apple.com <eric.carlson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 20 17:27:01 2009 +0000
2009-11-20 Eric Carlson <eric.carlson at apple.com>
Reviewed by Simon Fraser.
<rdar://problem/7389945> QTKit based media engine should not claim to support
fullscreen on Leopard
* platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
(WebCore::MediaPlayerPrivate::supportsFullscreen):
Only return true on SnowLeopard for now.
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::shouldRenderMediaControlPart):
No need to special case MediaFullscreenButtonPart as the default implementation
asks the media engine if it supports fullscreen.
2009-11-20 Eric Carlson <eric.carlson at apple.com>
Reviewed by Simon Fraser.
<rdar://problem/7389945> QTKit based media engine should not claim to support fullscreen on Leopard
Update test results.
* platform/mac/media/audio-controls-rendering-expected.checksum:
* platform/mac/media/audio-controls-rendering-expected.png:
* platform/mac/media/audio-controls-rendering-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51238 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 850bfa9..246fa3f 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2009-11-20 Eric Carlson <eric.carlson at apple.com>
+
+ Reviewed by Simon Fraser.
+
+ <rdar://problem/7389945> QTKit based media engine should not claim to support fullscreen on Leopard
+
+ Update test results.
+
+ * platform/mac/media/audio-controls-rendering-expected.checksum:
+ * platform/mac/media/audio-controls-rendering-expected.png:
+ * platform/mac/media/audio-controls-rendering-expected.txt:
+
2009-11-20 Roland Steiner <rolandsteiner at chromium.org>
Reviewed by Darin Adler.
diff --git a/LayoutTests/platform/mac/media/audio-controls-rendering-expected.checksum b/LayoutTests/platform/mac/media/audio-controls-rendering-expected.checksum
index 0fe6b42..42d1ef7 100644
--- a/LayoutTests/platform/mac/media/audio-controls-rendering-expected.checksum
+++ b/LayoutTests/platform/mac/media/audio-controls-rendering-expected.checksum
@@ -1 +1 @@
-9275f97797ebdf9770ec4aee1f0ea9bf
\ No newline at end of file
+cd78dfa514aedff4e81f0a43408d688e
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/media/audio-controls-rendering-expected.png b/LayoutTests/platform/mac/media/audio-controls-rendering-expected.png
index 32831f2..59ebedb 100644
Binary files a/LayoutTests/platform/mac/media/audio-controls-rendering-expected.png and b/LayoutTests/platform/mac/media/audio-controls-rendering-expected.png differ
diff --git a/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt b/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt
index 0860a20..9ff6c9a 100644
--- a/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt
+++ b/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt
@@ -20,29 +20,27 @@ layer at (8,42) size 200x25
RenderFlexibleBox (positioned) {DIV} at (0,0) size 200x25
RenderButton {INPUT} at (6,3) size 18x18
RenderButton {INPUT} at (32,4) size 16x16
- RenderFlexibleBox {DIV} at (49,1) size 96x22
- RenderSlider {INPUT} at (0,5) size 96x13
+ RenderFlexibleBox {DIV} at (49,1) size 126x22
+ RenderSlider {INPUT} at (0,5) size 126x13
RenderBlock {DIV} at (0,1) size 12x10
- RenderButton {INPUT} at (177,4) size 16x16
- RenderButton {INPUT} at (147,5) size 15x14
+ RenderButton {INPUT} at (177,5) size 15x14
layer at (8,85) size 320x25
RenderBlock (relative positioned) {DIV} at (0,0) size 320x25
layer at (8,85) size 320x25
RenderFlexibleBox (positioned) {DIV} at (0,0) 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
+ RenderFlexibleBox {DIV} at (49,5) size 246x15
+ RenderSlider {INPUT} at (45,2) size 156x13
RenderBlock {DIV} at (0,1) size 12x10
- RenderButton {INPUT} at (297,4) size 16x16
- RenderButton {INPUT} at (267,5) size 15x14
+ RenderButton {INPUT} at (297,5) size 15x14
layer at (57,92) 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,92) size 45x11
- RenderFlexibleBox {DIV} at (171,2) size 45x11 [color=#FFFFFF]
+layer at (258,92) size 45x11
+ RenderFlexibleBox {DIV} at (201,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:07"
@@ -54,18 +52,17 @@ layer at (8,203) size 320x25
RenderFlexibleBox (positioned) {DIV} at (0,75) 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
+ RenderFlexibleBox {DIV} at (49,5) size 246x15
+ RenderSlider {INPUT} at (45,2) size 156x13
RenderBlock {DIV} at (0,1) size 12x10
- RenderButton {INPUT} at (297,4) size 16x16
- RenderButton {INPUT} at (267,5) size 15x14
+ RenderButton {INPUT} at (297,5) size 15x14
layer at (57,210) 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,210) size 45x11
- RenderFlexibleBox {DIV} at (171,2) size 45x11 [color=#FFFFFF]
+layer at (258,210) size 45x11
+ RenderFlexibleBox {DIV} at (201,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:07"
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 49504b2..d73f2f3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2009-11-20 Eric Carlson <eric.carlson at apple.com>
+
+ Reviewed by Simon Fraser.
+
+ <rdar://problem/7389945> QTKit based media engine should not claim to support
+ fullscreen on Leopard
+
+ * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
+ (WebCore::MediaPlayerPrivate::supportsFullscreen):
+ Only return true on SnowLeopard for now.
+
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::shouldRenderMediaControlPart):
+ No need to special case MediaFullscreenButtonPart as the default implementation
+ asks the media engine if it supports fullscreen.
+
2009-11-18 Girish Ramakrishnan <girish at forwardbias.in>
Reviewed by Simon Hausmann.
diff --git a/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm b/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm
index ae1acee..dfb5958 100644
--- a/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm
+++ b/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm
@@ -736,8 +736,13 @@ bool MediaPlayerPrivate::hasAudio() const
}
bool MediaPlayerPrivate::supportsFullscreen() const
-{
+{
+#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
return true;
+#else
+ // See <rdar://problem/7389945>
+ return false;
+#endif
}
void MediaPlayerPrivate::setVolume(float volume)
diff --git a/WebCore/rendering/RenderThemeMac.mm b/WebCore/rendering/RenderThemeMac.mm
index 410bb9b..f2bdd7b 100644
--- a/WebCore/rendering/RenderThemeMac.mm
+++ b/WebCore/rendering/RenderThemeMac.mm
@@ -1707,9 +1707,6 @@ String RenderThemeMac::extraMediaControlsStyleSheet()
bool RenderThemeMac::shouldRenderMediaControlPart(ControlPart part, Element* element)
{
- if (part == MediaFullscreenButtonPart)
- return mediaControllerTheme() == MediaControllerThemeQuickTime;
-
if (part == MediaToggleClosedCaptionsButtonPart) {
// We rely on QTKit to render captions so don't enable the button unless it will be able to do so.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list