[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
Thu Apr 8 00:35:21 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 24b545198305729fd7c59c2926511f5e67dce3e9
Author: eric.carlson at apple.com <eric.carlson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Dec 14 16:16:57 2009 +0000
2009-12-14 Eric Carlson <eric.carlson at apple.com>
Reviewed by Dan Bernstein.
<rdar://problem/6293979> Adopt shared control drawing for <video> controls on Leopard and Windows
Use MediaControllerThemeQuickTime on Leopard.
* rendering/RenderThemeMac.mm:
(WebCore::mediaControllerTheme):
2009-12-14 Eric Carlson <eric.carlson at apple.com>
Reviewed by Dan Bernstein.
<rdar://problem/6293979> Adopt shared control drawing for <video> controls on Leopard and Windows
Regenerate layout and pixel test results for the new UI.
* platform/mac-leopard/Skipped:
* platform/mac-leopard/accessibility/media-element-expected.txt:
* platform/mac-leopard/media/audio-controls-rendering-expected.checksum:
* platform/mac-leopard/media/audio-controls-rendering-expected.txt:
* platform/mac-leopard/media/controls-after-reload-expected.checksum: Added.
* platform/mac-leopard/media/controls-after-reload-expected.png: Added.
* platform/mac-leopard/media/controls-after-reload-expected.txt:
* platform/mac-leopard/media/controls-drag-timebar-expected.txt:
* platform/mac-leopard/media/controls-strict-expected.checksum: Added.
* platform/mac-leopard/media/controls-strict-expected.png: Added.
* platform/mac-leopard/media/controls-strict-expected.txt:
* platform/mac-leopard/media/controls-strict-mode-expected.txt: Added.
* platform/mac-leopard/media/controls-styling-expected.checksum: Added.
* platform/mac-leopard/media/controls-styling-expected.png: Added.
* platform/mac-leopard/media/controls-styling-expected.txt:
* platform/mac-leopard/media/video-controls-rendering-expected.checksum:
* platform/mac-leopard/media/video-controls-rendering-expected.txt:
* platform/mac-leopard/media/video-display-toggle-expected.checksum:
* platform/mac-leopard/media/video-display-toggle-expected.txt:
* platform/mac-leopard/media/video-no-audio-expected.checksum: Added.
* platform/mac-leopard/media/video-no-audio-expected.png: Added.
* platform/mac-leopard/media/video-no-audio-expected.txt:
* platform/mac-leopard/media/video-zoom-controls-expected.checksum:
* platform/mac-leopard/media/video-zoom-controls-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52094 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a579a1c..30f21a1 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,36 @@
+2009-12-14 Eric Carlson <eric.carlson at apple.com>
+
+ Reviewed by Dan Bernstein.
+
+ <rdar://problem/6293979> Adopt shared control drawing for <video> controls on Leopard and Windows
+
+ Regenerate layout and pixel test results for the new UI.
+
+ * platform/mac-leopard/Skipped:
+ * platform/mac-leopard/accessibility/media-element-expected.txt:
+ * platform/mac-leopard/media/audio-controls-rendering-expected.checksum:
+ * platform/mac-leopard/media/audio-controls-rendering-expected.txt:
+ * platform/mac-leopard/media/controls-after-reload-expected.checksum: Added.
+ * platform/mac-leopard/media/controls-after-reload-expected.png: Added.
+ * platform/mac-leopard/media/controls-after-reload-expected.txt:
+ * platform/mac-leopard/media/controls-drag-timebar-expected.txt:
+ * platform/mac-leopard/media/controls-strict-expected.checksum: Added.
+ * platform/mac-leopard/media/controls-strict-expected.png: Added.
+ * platform/mac-leopard/media/controls-strict-expected.txt:
+ * platform/mac-leopard/media/controls-strict-mode-expected.txt: Added.
+ * platform/mac-leopard/media/controls-styling-expected.checksum: Added.
+ * platform/mac-leopard/media/controls-styling-expected.png: Added.
+ * platform/mac-leopard/media/controls-styling-expected.txt:
+ * platform/mac-leopard/media/video-controls-rendering-expected.checksum:
+ * platform/mac-leopard/media/video-controls-rendering-expected.txt:
+ * platform/mac-leopard/media/video-display-toggle-expected.checksum:
+ * platform/mac-leopard/media/video-display-toggle-expected.txt:
+ * platform/mac-leopard/media/video-no-audio-expected.checksum: Added.
+ * platform/mac-leopard/media/video-no-audio-expected.png: Added.
+ * platform/mac-leopard/media/video-no-audio-expected.txt:
+ * platform/mac-leopard/media/video-zoom-controls-expected.checksum:
+ * platform/mac-leopard/media/video-zoom-controls-expected.txt:
+
2009-12-14 Philippe Normand <pnormand at igalia.com>
Rubber-stamped by Gustavo Noronha Silva.
diff --git a/LayoutTests/platform/mac-leopard/Skipped b/LayoutTests/platform/mac-leopard/Skipped
index 5e370e0..2bb4933 100644
--- a/LayoutTests/platform/mac-leopard/Skipped
+++ b/LayoutTests/platform/mac-leopard/Skipped
@@ -33,3 +33,11 @@ media/media-can-play-ogg.html
# This test relies on a JS object getting GC'd, which seems to be less reliable on Leopard.
fast/workers/dedicated-worker-lifecycle.html
+
+# Disable media tests that depend on controller size/position until
+# <rdar://problem/6502936> Update run-webkit-tests to deal with new media controller look
+# has been fixed
+media/audio-delete-while-slider-thumb-clicked.html
+media/audio-delete-while-step-button-clicked.html
+media/video-controls-visible-audio-only.html
+media/video-controls-zoomed.html
diff --git a/LayoutTests/platform/mac-leopard/accessibility/media-element-expected.txt b/LayoutTests/platform/mac-leopard/accessibility/media-element-expected.txt
index c54bede..7eacfba 100644
--- a/LayoutTests/platform/mac-leopard/accessibility/media-element-expected.txt
+++ b/LayoutTests/platform/mac-leopard/accessibility/media-element-expected.txt
@@ -8,10 +8,18 @@ State at 'load' event:
role: AXRole: AXToolbar
+ description: AXDescription: back 30 seconds
+ role: AXRole: AXButton
+
+
description: AXDescription: play
role: AXRole: AXButton
+ description: AXDescription: elapsed time
+ role: AXRole: AXStaticText
+
+
description: AXDescription:
role: AXRole: AXSlider
@@ -20,12 +28,8 @@ State at 'load' event:
role: AXRole: AXValueIndicator
- description: AXDescription: fast reverse
- role: AXRole: AXButton
-
-
- description: AXDescription: fast forward
- role: AXRole: AXButton
+ description: AXDescription: remaining time
+ role: AXRole: AXStaticText
description: AXDescription: mute
diff --git a/LayoutTests/platform/mac-leopard/media/audio-controls-rendering-expected.checksum b/LayoutTests/platform/mac-leopard/media/audio-controls-rendering-expected.checksum
index be7fac4..2e1a032 100644
--- a/LayoutTests/platform/mac-leopard/media/audio-controls-rendering-expected.checksum
+++ b/LayoutTests/platform/mac-leopard/media/audio-controls-rendering-expected.checksum
@@ -1 +1 @@
-3f62d77ff5626bf97cf711195a268d7c
\ No newline at end of file
+23d92921001dcac799a7bf70535f0723
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/media/audio-controls-rendering-expected.txt b/LayoutTests/platform/mac-leopard/media/audio-controls-rendering-expected.txt
index 77de6be..d7ab43a 100644
--- a/LayoutTests/platform/mac-leopard/media/audio-controls-rendering-expected.txt
+++ b/LayoutTests/platform/mac-leopard/media/audio-controls-rendering-expected.txt
@@ -6,46 +6,63 @@ layer at (0,0) size 800x600
RenderBlock {P} at (0,0) size 784x18
RenderText {#text} at (0,0) size 153x18
text run at (0,0) width 153: "Test controls placement."
- RenderBlock (anonymous) at (0,34) size 784x86
- RenderMedia {AUDIO} at (0,0) size 200x16 [bgcolor=#0000FF]
- RenderBR {BR} at (200,16) size 0x0
- RenderBR {BR} at (0,16) size 0x18
- RenderMedia {AUDIO} at (0,34) size 320x16 [bgcolor=#0000FF]
- RenderBR {BR} at (320,50) size 0x0
- RenderBR {BR} at (0,50) size 0x18
+ RenderBlock (anonymous) at (0,34) size 784x104
+ RenderMedia {AUDIO} at (0,0) size 200x25 [bgcolor=#0000FF]
+ RenderBR {BR} at (200,25) size 0x0
+ RenderBR {BR} at (0,25) size 0x18
+ RenderMedia {AUDIO} at (0,43) size 320x25 [bgcolor=#0000FF]
+ RenderBR {BR} at (320,68) size 0x0
RenderBR {BR} at (0,68) size 0x18
-layer at (8,42) size 200x16
- RenderBlock (relative positioned) {DIV} at (0,0) size 200x16
-layer at (8,42) size 200x16
- RenderFlexibleBox (positioned) {DIV} at (0,0) size 200x16
- RenderButton {INPUT} at (0,0) size 16x16
- RenderFlexibleBox {DIV} at (16,0) size 136x16
- RenderSlider {INPUT} at (0,0) size 136x16
- RenderBlock {DIV} at (2,1) size 13x14
- RenderButton {INPUT} at (152,0) size 16x16
- RenderButton {INPUT} at (168,0) size 16x16
- RenderButton {INPUT} at (184,0) size 16x16
-layer at (8,76) size 320x16
- RenderBlock (relative positioned) {DIV} at (0,0) size 320x16
-layer at (8,76) size 320x16
- RenderFlexibleBox (positioned) {DIV} at (0,0) size 320x16
- RenderButton {INPUT} at (0,0) size 16x16
- RenderFlexibleBox {DIV} at (16,0) size 256x16
- RenderSlider {INPUT} at (0,0) size 256x16
- RenderBlock {DIV} at (2,1) size 13x14
- RenderButton {INPUT} at (272,0) size 16x16
- RenderButton {INPUT} at (288,0) size 16x16
- RenderButton {INPUT} at (304,0) size 16x16
-layer at (8,110) size 320x100
- RenderMedia {AUDIO} at (8,110) size 320x100 [bgcolor=#0000FF]
-layer at (8,110) size 320x100
+ RenderBR {BR} at (0,86) size 0x18
+layer at (8,42) size 200x25
+ RenderBlock (relative positioned) {DIV} at (0,0) size 200x25
+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 126x22
+ RenderSlider {INPUT} at (0,5) size 126x13
+ RenderBlock {DIV} at (0,2) size 10x8
+ 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 246x15
+ RenderSlider {INPUT} at (45,2) size 156x13
+ RenderBlock {DIV} at (0,2) size 10x8
+ 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 (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"
+layer at (8,128) size 320x100
+ RenderMedia {AUDIO} at (8,128) size 320x100 [bgcolor=#0000FF]
+layer at (8,128) size 320x100
RenderBlock (relative positioned) {DIV} at (0,0) size 320x100
-layer at (8,194) size 320x16
- RenderFlexibleBox (positioned) {DIV} at (0,84) size 320x16
- RenderButton {INPUT} at (0,0) size 16x16
- RenderFlexibleBox {DIV} at (16,0) size 256x16
- RenderSlider {INPUT} at (0,0) size 256x16
- RenderBlock {DIV} at (2,1) size 13x14
- RenderButton {INPUT} at (272,0) size 16x16
- RenderButton {INPUT} at (288,0) size 16x16
- RenderButton {INPUT} at (304,0) size 16x16
+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 246x15
+ RenderSlider {INPUT} at (45,2) size 156x13
+ RenderBlock {DIV} at (0,2) size 10x8
+ 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 (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/LayoutTests/platform/mac-leopard/media/controls-after-reload-expected.checksum b/LayoutTests/platform/mac-leopard/media/controls-after-reload-expected.checksum
new file mode 100644
index 0000000..0677211
--- /dev/null
+++ b/LayoutTests/platform/mac-leopard/media/controls-after-reload-expected.checksum
@@ -0,0 +1 @@
+1273306fd2815b4c06a2c49634621bd6
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/media/controls-after-reload-expected.png b/LayoutTests/platform/mac-leopard/media/controls-after-reload-expected.png
new file mode 100644
index 0000000..5ad3160
Binary files /dev/null and b/LayoutTests/platform/mac-leopard/media/controls-after-reload-expected.png differ
diff --git a/LayoutTests/platform/mac-leopard/media/controls-after-reload-expected.txt b/LayoutTests/platform/mac-leopard/media/controls-after-reload-expected.txt
index 923fac3..1904766 100644
--- a/LayoutTests/platform/mac-leopard/media/controls-after-reload-expected.txt
+++ b/LayoutTests/platform/mac-leopard/media/controls-after-reload-expected.txt
@@ -14,12 +14,21 @@ layer at (8,42) 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
- RenderFlexibleBox {DIV} at (16,0) size 256x16
- RenderSlider {INPUT} at (0,0) size 256x16
- RenderBlock {DIV} at (2,1) size 13x14
- RenderButton {INPUT} at (272,0) size 16x16
- 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 246x15
+ RenderSlider {INPUT} at (45,2) size 156x13
+ RenderBlock {DIV} at (0,2) size 10x8
+ RenderButton {INPUT} at (297,5) size 15x14
+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 (258,264) 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:06"
diff --git a/LayoutTests/platform/mac-leopard/media/controls-drag-timebar-expected.txt b/LayoutTests/platform/mac-leopard/media/controls-drag-timebar-expected.txt
index 3231085..1fdf1ad 100644
--- a/LayoutTests/platform/mac-leopard/media/controls-drag-timebar-expected.txt
+++ b/LayoutTests/platform/mac-leopard/media/controls-drag-timebar-expected.txt
@@ -4,10 +4,10 @@ RUN(video.autoplay = true)
RUN(video.src = 'content/test.mp4')
EVENT(playing)
EVENT(seeked)
-Time: 2.1
+Time: 0.3
EVENT(seeked)
-Time: 2.6
+Time: 1.1
EVENT(seeked)
-Time: 3.1
+Time: 1.9
END OF TEST
diff --git a/LayoutTests/platform/mac-leopard/media/controls-strict-expected.checksum b/LayoutTests/platform/mac-leopard/media/controls-strict-expected.checksum
new file mode 100644
index 0000000..713f622
--- /dev/null
+++ b/LayoutTests/platform/mac-leopard/media/controls-strict-expected.checksum
@@ -0,0 +1 @@
+4f2430c865a33db87ed098279109288e
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/media/controls-strict-expected.png b/LayoutTests/platform/mac-leopard/media/controls-strict-expected.png
new file mode 100644
index 0000000..bcab490
Binary files /dev/null and b/LayoutTests/platform/mac-leopard/media/controls-strict-expected.png differ
diff --git a/LayoutTests/platform/mac-leopard/media/controls-strict-expected.txt b/LayoutTests/platform/mac-leopard/media/controls-strict-expected.txt
index 5296d55..94db021 100644
--- a/LayoutTests/platform/mac-leopard/media/controls-strict-expected.txt
+++ b/LayoutTests/platform/mac-leopard/media/controls-strict-expected.txt
@@ -14,12 +14,21 @@ 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
- RenderFlexibleBox {DIV} at (16,0) size 256x16
- RenderSlider {INPUT} at (0,0) size 256x16
- RenderBlock {DIV} at (2,1) size 13x14
- RenderButton {INPUT} at (272,0) size 16x16
- 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 246x15
+ RenderSlider {INPUT} at (45,2) size 156x13
+ RenderBlock {DIV} at (0,2) size 10x8
+ RenderButton {INPUT} at (297,5) size 15x14
+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 (258,272) 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:06"
diff --git a/LayoutTests/platform/mac/media/controls-strict-mode-expected.txt b/LayoutTests/platform/mac-leopard/media/controls-strict-mode-expected.txt
similarity index 100%
copy from LayoutTests/platform/mac/media/controls-strict-mode-expected.txt
copy to LayoutTests/platform/mac-leopard/media/controls-strict-mode-expected.txt
diff --git a/LayoutTests/platform/mac-leopard/media/controls-styling-expected.checksum b/LayoutTests/platform/mac-leopard/media/controls-styling-expected.checksum
new file mode 100644
index 0000000..754fe1e
--- /dev/null
+++ b/LayoutTests/platform/mac-leopard/media/controls-styling-expected.checksum
@@ -0,0 +1 @@
+a2d4f10efd0372bf429cd96e2ca8de96
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/media/controls-styling-expected.png b/LayoutTests/platform/mac-leopard/media/controls-styling-expected.png
new file mode 100644
index 0000000..8392d66
Binary files /dev/null and b/LayoutTests/platform/mac-leopard/media/controls-styling-expected.png differ
diff --git a/LayoutTests/platform/mac-leopard/media/controls-styling-expected.txt b/LayoutTests/platform/mac-leopard/media/controls-styling-expected.txt
index fd24373..890e91e 100644
--- a/LayoutTests/platform/mac-leopard/media/controls-styling-expected.txt
+++ b/LayoutTests/platform/mac-leopard/media/controls-styling-expected.txt
@@ -18,23 +18,41 @@ layer at (8,282) size 320x240
RenderVideo {VIDEO} at (0,0) size 320x240
layer at (18,42) size 320x240
RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
-layer at (18,266) size 320x16
- RenderFlexibleBox (positioned) {DIV} at (0,224) size 320x16
- RenderButton {INPUT} at (0,0) size 16x16
- RenderFlexibleBox {DIV} at (16,0) size 256x16
- RenderSlider {INPUT} at (0,0) size 256x16
- RenderBlock {DIV} at (2,1) size 13x14
- RenderButton {INPUT} at (272,0) size 16x16
- RenderButton {INPUT} at (288,0) size 16x16
- RenderButton {INPUT} at (304,0) size 16x16
+layer at (18,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 246x15
+ RenderSlider {INPUT} at (45,2) size 156x13
+ RenderBlock {DIV} at (0,2) size 10x8
+ RenderButton {INPUT} at (297,5) size 15x14
+layer at (67,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 (268,264) 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: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
- RenderFlexibleBox {DIV} at (16,0) size 256x16
- RenderSlider {INPUT} at (0,0) size 256x16
- RenderBlock {DIV} at (2,1) size 13x14
- RenderButton {INPUT} at (272,0) size 16x16
- 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 246x15
+ RenderSlider {INPUT} at (45,2) size 156x13
+ RenderBlock {DIV} at (0,2) size 10x8
+ RenderButton {INPUT} at (297,5) size 15x14
+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 (258,504) 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:06"
diff --git a/LayoutTests/platform/mac-leopard/media/video-controls-rendering-expected.checksum b/LayoutTests/platform/mac-leopard/media/video-controls-rendering-expected.checksum
index f95b6d9..c0cd921 100644
--- a/LayoutTests/platform/mac-leopard/media/video-controls-rendering-expected.checksum
+++ b/LayoutTests/platform/mac-leopard/media/video-controls-rendering-expected.checksum
@@ -1 +1 @@
-bf317da4b87ce6fed4dc9f516467697d
\ No newline at end of file
+64d308758277aa61c61875a25e85d480
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/media/video-controls-rendering-expected.txt b/LayoutTests/platform/mac-leopard/media/video-controls-rendering-expected.txt
index fff11e1..787d870 100644
--- a/LayoutTests/platform/mac-leopard/media/video-controls-rendering-expected.txt
+++ b/LayoutTests/platform/mac-leopard/media/video-controls-rendering-expected.txt
@@ -17,36 +17,63 @@ 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
- RenderFlexibleBox {DIV} at (16,0) size 256x16
- RenderSlider {INPUT} at (0,0) size 256x16
- RenderBlock {DIV} at (2,1) size 13x14
- RenderButton {INPUT} at (272,0) size 16x16
- 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 246x15
+ RenderSlider {INPUT} at (45,2) size 156x13
+ RenderBlock {DIV} at (0,2) size 10x8
+ RenderButton {INPUT} at (297,5) size 15x14
+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 (258,264) 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: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
- RenderFlexibleBox {DIV} at (16,0) size 256x16
- RenderSlider {INPUT} at (0,0) size 256x16
- RenderBlock {DIV} at (2,1) size 13x14
- RenderButton {INPUT} at (272,0) size 16x16
- 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 246x15
+ RenderSlider {INPUT} at (45,2) size 156x13
+ RenderBlock {DIV} at (0,2) size 10x8
+ RenderButton {INPUT} at (297,5) size 15x14
+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 (258,504) 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: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
- RenderFlexibleBox {DIV} at (16,0) size 256x16
- RenderSlider {INPUT} at (0,0) size 256x16
- RenderBlock {DIV} at (2,1) size 13x14
- RenderButton {INPUT} at (272,0) size 16x16
- 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 246x15
+ RenderSlider {INPUT} at (45,2) size 156x13
+ RenderBlock {DIV} at (0,2) size 10x8
+ RenderButton {INPUT} at (297,5) size 15x14
+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 (258,744) 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:06"
diff --git a/LayoutTests/platform/mac-leopard/media/video-display-toggle-expected.checksum b/LayoutTests/platform/mac-leopard/media/video-display-toggle-expected.checksum
index 5f01a8c..07729ae 100644
--- a/LayoutTests/platform/mac-leopard/media/video-display-toggle-expected.checksum
+++ b/LayoutTests/platform/mac-leopard/media/video-display-toggle-expected.checksum
@@ -1 +1 @@
-5311c5ec0c96c170daf516be906e8c37
\ No newline at end of file
+17ee6d9a2205cf9f242bd7aeee4e003d
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/media/video-display-toggle-expected.txt b/LayoutTests/platform/mac-leopard/media/video-display-toggle-expected.txt
index a9baa00..72242e0 100644
--- a/LayoutTests/platform/mac-leopard/media/video-display-toggle-expected.txt
+++ b/LayoutTests/platform/mac-leopard/media/video-display-toggle-expected.txt
@@ -13,12 +13,21 @@ 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
- RenderFlexibleBox {DIV} at (16,0) size 256x16
- RenderSlider {INPUT} at (0,0) size 256x16
- RenderBlock {DIV} at (2,1) size 13x14
- RenderButton {INPUT} at (272,0) size 16x16
- 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 246x15
+ RenderSlider {INPUT} at (45,2) size 156x13
+ RenderBlock {DIV} at (0,2) size 10x8
+ RenderButton {INPUT} at (297,5) size 15x14
+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 (258,248) 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:06"
diff --git a/LayoutTests/platform/mac-leopard/media/video-no-audio-expected.checksum b/LayoutTests/platform/mac-leopard/media/video-no-audio-expected.checksum
new file mode 100644
index 0000000..8cb46a6
--- /dev/null
+++ b/LayoutTests/platform/mac-leopard/media/video-no-audio-expected.checksum
@@ -0,0 +1 @@
+ff94259493306a136e4509ba2aa98349
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/media/video-no-audio-expected.png b/LayoutTests/platform/mac-leopard/media/video-no-audio-expected.png
new file mode 100644
index 0000000..208d478
Binary files /dev/null and b/LayoutTests/platform/mac-leopard/media/video-no-audio-expected.png differ
diff --git a/LayoutTests/platform/mac-leopard/media/video-no-audio-expected.txt b/LayoutTests/platform/mac-leopard/media/video-no-audio-expected.txt
index f0872fc..e042007 100644
--- a/LayoutTests/platform/mac-leopard/media/video-no-audio-expected.txt
+++ b/LayoutTests/platform/mac-leopard/media/video-no-audio-expected.txt
@@ -14,11 +14,20 @@ layer at (8,42) size 640x480
RenderVideo {VIDEO} at (0,0) size 640x480
layer at (8,42) size 640x480
RenderBlock (relative positioned) {DIV} at (0,0) size 640x480
-layer at (8,506) size 640x16
- RenderFlexibleBox (positioned) {DIV} at (0,464) size 640x16
- RenderButton {INPUT} at (0,0) size 16x16
- RenderFlexibleBox {DIV} at (16,0) size 592x16
- RenderSlider {INPUT} at (0,0) size 592x16
- RenderBlock {DIV} at (2,1) size 13x14
- RenderButton {INPUT} at (608,0) size 16x16
- RenderButton {INPUT} at (624,0) size 16x16
+layer at (8,497) size 640x25
+ RenderFlexibleBox (positioned) {DIV} at (0,455) size 640x25
+ RenderButton {INPUT} at (6,3) size 18x18
+ RenderButton {INPUT} at (32,4) size 16x16
+ RenderFlexibleBox {DIV} at (49,5) size 591x15
+ RenderSlider {INPUT} at (45,2) size 501x13
+ RenderBlock {DIV} at (0,2) size 10x8
+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 (603,504) size 45x11
+ RenderFlexibleBox {DIV} at (546,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"
diff --git a/LayoutTests/platform/mac-leopard/media/video-zoom-controls-expected.checksum b/LayoutTests/platform/mac-leopard/media/video-zoom-controls-expected.checksum
index 5410607..34318d9 100644
--- a/LayoutTests/platform/mac-leopard/media/video-zoom-controls-expected.checksum
+++ b/LayoutTests/platform/mac-leopard/media/video-zoom-controls-expected.checksum
@@ -1 +1 @@
-eee3bf7eb7e80387520c20a3f7fa3fb1
\ No newline at end of file
+ab0418171dc006bc21c5848e7c474bf8
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/media/video-zoom-controls-expected.txt b/LayoutTests/platform/mac-leopard/media/video-zoom-controls-expected.txt
index 93618ac..b9b79a7 100644
--- a/LayoutTests/platform/mac-leopard/media/video-zoom-controls-expected.txt
+++ b/LayoutTests/platform/mac-leopard/media/video-zoom-controls-expected.txt
@@ -10,25 +10,23 @@ layer at (57,85) size 240x180
RenderVideo {VIDEO} at (45,73) size 240x180
layer at (57,85) size 240x180
RenderBlock (relative positioned) {DIV} at (0,0) size 240x180
-layer at (57,241) size 240x24
- RenderFlexibleBox (positioned) {DIV} at (0,156) size 240x24
- RenderButton {INPUT} at (0,0) size 24x24
- RenderFlexibleBox {DIV} at (24,0) size 144x24
- RenderSlider {INPUT} at (0,0) size 144x24
- RenderBlock {DIV} at (3,1) size 19x21
- RenderButton {INPUT} at (168,0) size 24x24
- RenderButton {INPUT} at (192,0) size 24x24
- RenderButton {INPUT} at (216,0) size 24x24
+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 130x34
+ RenderSlider {INPUT} at (0,9) size 130x19
+ RenderBlock {DIV} at (0,3) size 15x12
+ RenderButton {INPUT} at (206,8) size 22x21
layer at (57,310) size 240x180
RenderVideo {VIDEO} at (45,298) size 240x180
layer at (57,310) size 240x180
RenderBlock (relative positioned) {DIV} at (0,0) size 240x180
-layer at (57,466) size 240x24
- RenderFlexibleBox (positioned) {DIV} at (0,156) size 240x24
- RenderButton {INPUT} at (0,0) size 24x24
- RenderFlexibleBox {DIV} at (24,0) size 144x24
- RenderSlider {INPUT} at (0,0) size 144x24
- RenderBlock {DIV} at (3,1) size 19x21
- RenderButton {INPUT} at (168,0) size 24x24
- RenderButton {INPUT} at (192,0) size 24x24
- RenderButton {INPUT} at (216,0) size 24x24
+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 130x34
+ RenderSlider {INPUT} at (0,9) size 130x19
+ RenderBlock {DIV} at (0,3) size 15x12
+ RenderButton {INPUT} at (206,8) size 22x21
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f303804..25f866d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2009-12-14 Eric Carlson <eric.carlson at apple.com>
+
+ Reviewed by Dan Bernstein.
+
+ <rdar://problem/6293979> Adopt shared control drawing for <video> controls on Leopard and Windows
+
+ Use MediaControllerThemeQuickTime on Leopard.
+
+ * rendering/RenderThemeMac.mm:
+ (WebCore::mediaControllerTheme):
+
2009-12-14 Adam Roben <aroben at apple.com>
Move QuartzCore-related build settings into a vsprops file
diff --git a/WebCore/rendering/RenderThemeMac.mm b/WebCore/rendering/RenderThemeMac.mm
index 6304947..ddb538b 100644
--- a/WebCore/rendering/RenderThemeMac.mm
+++ b/WebCore/rendering/RenderThemeMac.mm
@@ -1434,13 +1434,10 @@ static int mediaControllerTheme()
controllerTheme = MediaControllerThemeClassic;
- if (!wkMediaControllerThemeAvailable(MediaControllerThemeQuickTime))
- return controllerTheme;
-
Boolean validKey;
Boolean useQTMediaUIPref = CFPreferencesGetAppBooleanValue(CFSTR("UseQuickTimeMediaUI"), CFSTR("com.apple.WebCore"), &validKey);
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#if !defined(BUILDING_ON_TIGER)
if (validKey && !useQTMediaUIPref)
return controllerTheme;
#else
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list