WebCore:
authoradele@apple.com <adele@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 25 Jan 2008 22:28:49 +0000 (22:28 +0000)
committeradele@apple.com <adele@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 25 Jan 2008 22:28:49 +0000 (22:28 +0000)
        Reviewed by Sam.

        Fix for <rdar://problem/5679452> Finish tweaking layout/alignment of media controls slider to match QuickTime plug-in

        * css/html4.css: Add horizontal padding to the media slider.
        * rendering/RenderSlider.cpp:
        (WebCore::HTMLSliderThumbElement::defaultEventHandler): Replace use of absoluteBoundingBox() with width() and height()
        (WebCore::RenderSlider::positionForOffset): ditto. Also, use the trackSize() for the maximum offset.
        (WebCore::RenderSlider::layout):  Use contentWidth() and contentHeight() to take padding into account.
        (WebCore::RenderSlider::trackSize): ditto.

LayoutTests:

        Reviewed by Sam.

        Adding new test and updated results for:
        <rdar://problem/5679452> Finish tweaking layout/alignment of media controls slider to match QuickTime plug-in

        * fast/forms/slider-padding.html: Added.
        * platform/mac/fast/forms/slider-padding-expected.checksum: Added.
        * platform/mac/fast/forms/slider-padding-expected.png: Added.
        * platform/mac/fast/forms/slider-padding-expected.txt: Added.
        * platform/mac/media/audio-controls-rendering-expected.checksum:
        * platform/mac/media/audio-controls-rendering-expected.png:
        * platform/mac/media/audio-controls-rendering-expected.txt:
        * platform/mac/media/broken-video-expected.checksum:
        * platform/mac/media/broken-video-expected.png:
        * platform/mac/media/progress-event-expected.checksum:
        * platform/mac/media/progress-event-expected.png:
        * platform/mac/media/unsupported-rtsp-expected.checksum:
        * platform/mac/media/unsupported-rtsp-expected.png:
        * platform/mac/media/unsupported-tracks-expected.checksum:
        * platform/mac/media/unsupported-tracks-expected.png:
        * platform/mac/media/video-append-source-expected.checksum:
        * platform/mac/media/video-append-source-expected.png:
        * platform/mac/media/video-autoplay-expected.checksum:
        * platform/mac/media/video-autoplay-expected.png:
        * platform/mac/media/video-buffered-expected.checksum:
        * platform/mac/media/video-buffered-expected.png:
        * platform/mac/media/video-controls-expected.checksum:
        * platform/mac/media/video-controls-expected.png:
        * platform/mac/media/video-controls-rendering-expected.checksum:
        * platform/mac/media/video-controls-rendering-expected.png:
        * platform/mac/media/video-controls-rendering-expected.txt:
        * platform/mac/media/video-currentTime-set2-expected.checksum:
        * platform/mac/media/video-currentTime-set2-expected.png:
        * platform/mac/media/video-display-toggle-expected.checksum:
        * platform/mac/media/video-display-toggle-expected.png:
        * platform/mac/media/video-display-toggle-expected.txt:
        * platform/mac/media/video-dom-autoplay-expected.checksum:
        * platform/mac/media/video-dom-autoplay-expected.png:
        * platform/mac/media/video-dom-src-expected.checksum:
        * platform/mac/media/video-dom-src-expected.png:
        * platform/mac/media/video-dom-start-expected.checksum:
        * platform/mac/media/video-dom-start-expected.png:
        * platform/mac/media/video-error-abort-expected.checksum:
        * platform/mac/media/video-error-abort-expected.png:
        * platform/mac/media/video-error-does-not-exist-expected.checksum:
        * platform/mac/media/video-error-does-not-exist-expected.png:
        * platform/mac/media/video-load-networkState-expected.checksum:
        * platform/mac/media/video-load-networkState-expected.png:
        * platform/mac/media/video-load-readyState-expected.checksum:
        * platform/mac/media/video-load-readyState-expected.png:
        * platform/mac/media/video-muted-expected.checksum:
        * platform/mac/media/video-muted-expected.png:
        * platform/mac/media/video-no-autoplay-expected.checksum:
        * platform/mac/media/video-no-autoplay-expected.png:
        * platform/mac/media/video-pause-empty-events-expected.checksum:
        * platform/mac/media/video-pause-empty-events-expected.png:
        * platform/mac/media/video-play-empty-events-expected.checksum:
        * platform/mac/media/video-play-empty-events-expected.png:
        * platform/mac/media/video-play-pause-events-expected.checksum:
        * platform/mac/media/video-play-pause-events-expected.png:
        * platform/mac/media/video-play-pause-exception-expected.checksum:
        * platform/mac/media/video-play-pause-exception-expected.png:
        * platform/mac/media/video-seek-past-end-paused-expected.checksum:
        * platform/mac/media/video-seek-past-end-paused-expected.png:
        * platform/mac/media/video-seek-past-end-playing-expected.checksum:
        * platform/mac/media/video-seek-past-end-playing-expected.png:
        * platform/mac/media/video-seekable-expected.checksum:
        * platform/mac/media/video-seekable-expected.png:
        * platform/mac/media/video-seeking-expected.checksum:
        * platform/mac/media/video-seeking-expected.png:
        * platform/mac/media/video-size-expected.checksum:
        * platform/mac/media/video-size-expected.png:
        * platform/mac/media/video-source-expected.checksum:
        * platform/mac/media/video-source-expected.png:
        * platform/mac/media/video-source-media-expected.checksum:
        * platform/mac/media/video-source-media-expected.png:
        * platform/mac/media/video-source-type-expected.checksum:
        * platform/mac/media/video-source-type-expected.png:
        * platform/mac/media/video-src-change-expected.checksum:
        * platform/mac/media/video-src-change-expected.png:
        * platform/mac/media/video-src-expected.checksum:
        * platform/mac/media/video-src-expected.png:
        * platform/mac/media/video-src-remove-expected.checksum:
        * platform/mac/media/video-src-remove-expected.png:
        * platform/mac/media/video-src-set-expected.checksum:
        * platform/mac/media/video-src-set-expected.png:
        * platform/mac/media/video-src-source-expected.checksum:
        * platform/mac/media/video-src-source-expected.png:
        * platform/mac/media/video-start-expected.checksum:
        * platform/mac/media/video-start-expected.png:
        * platform/mac/media/video-volume-expected.checksum:
        * platform/mac/media/video-volume-expected.png:
        * platform/mac/media/video-width-height-expected.checksum:
        * platform/mac/media/video-width-height-expected.png:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@29795 268f45cc-cd09-0410-ab3c-d52691b4dbfc

93 files changed:
LayoutTests/ChangeLog
LayoutTests/fast/forms/slider-padding.html [new file with mode: 0644]
LayoutTests/platform/mac/fast/forms/slider-padding-expected.checksum [new file with mode: 0644]
LayoutTests/platform/mac/fast/forms/slider-padding-expected.png [new file with mode: 0644]
LayoutTests/platform/mac/fast/forms/slider-padding-expected.txt [new file with mode: 0644]
LayoutTests/platform/mac/media/audio-controls-rendering-expected.checksum
LayoutTests/platform/mac/media/audio-controls-rendering-expected.png
LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt
LayoutTests/platform/mac/media/broken-video-expected.checksum
LayoutTests/platform/mac/media/broken-video-expected.png
LayoutTests/platform/mac/media/progress-event-expected.checksum
LayoutTests/platform/mac/media/progress-event-expected.png
LayoutTests/platform/mac/media/unsupported-rtsp-expected.checksum
LayoutTests/platform/mac/media/unsupported-rtsp-expected.png
LayoutTests/platform/mac/media/unsupported-tracks-expected.checksum
LayoutTests/platform/mac/media/unsupported-tracks-expected.png
LayoutTests/platform/mac/media/video-append-source-expected.checksum
LayoutTests/platform/mac/media/video-append-source-expected.png
LayoutTests/platform/mac/media/video-autoplay-expected.checksum
LayoutTests/platform/mac/media/video-autoplay-expected.png
LayoutTests/platform/mac/media/video-buffered-expected.checksum
LayoutTests/platform/mac/media/video-buffered-expected.png
LayoutTests/platform/mac/media/video-controls-expected.checksum
LayoutTests/platform/mac/media/video-controls-expected.png
LayoutTests/platform/mac/media/video-controls-rendering-expected.checksum
LayoutTests/platform/mac/media/video-controls-rendering-expected.png
LayoutTests/platform/mac/media/video-controls-rendering-expected.txt
LayoutTests/platform/mac/media/video-currentTime-set2-expected.checksum
LayoutTests/platform/mac/media/video-currentTime-set2-expected.png
LayoutTests/platform/mac/media/video-display-toggle-expected.checksum
LayoutTests/platform/mac/media/video-display-toggle-expected.png
LayoutTests/platform/mac/media/video-display-toggle-expected.txt
LayoutTests/platform/mac/media/video-dom-autoplay-expected.checksum
LayoutTests/platform/mac/media/video-dom-autoplay-expected.png
LayoutTests/platform/mac/media/video-dom-src-expected.checksum
LayoutTests/platform/mac/media/video-dom-src-expected.png
LayoutTests/platform/mac/media/video-dom-start-expected.checksum
LayoutTests/platform/mac/media/video-dom-start-expected.png
LayoutTests/platform/mac/media/video-error-abort-expected.checksum
LayoutTests/platform/mac/media/video-error-abort-expected.png
LayoutTests/platform/mac/media/video-error-does-not-exist-expected.checksum
LayoutTests/platform/mac/media/video-error-does-not-exist-expected.png
LayoutTests/platform/mac/media/video-load-networkState-expected.checksum
LayoutTests/platform/mac/media/video-load-networkState-expected.png
LayoutTests/platform/mac/media/video-load-readyState-expected.checksum
LayoutTests/platform/mac/media/video-load-readyState-expected.png
LayoutTests/platform/mac/media/video-muted-expected.checksum
LayoutTests/platform/mac/media/video-muted-expected.png
LayoutTests/platform/mac/media/video-no-autoplay-expected.checksum
LayoutTests/platform/mac/media/video-no-autoplay-expected.png
LayoutTests/platform/mac/media/video-pause-empty-events-expected.checksum
LayoutTests/platform/mac/media/video-pause-empty-events-expected.png
LayoutTests/platform/mac/media/video-play-empty-events-expected.checksum
LayoutTests/platform/mac/media/video-play-empty-events-expected.png
LayoutTests/platform/mac/media/video-play-pause-events-expected.checksum
LayoutTests/platform/mac/media/video-play-pause-events-expected.png
LayoutTests/platform/mac/media/video-play-pause-exception-expected.checksum
LayoutTests/platform/mac/media/video-play-pause-exception-expected.png
LayoutTests/platform/mac/media/video-seek-past-end-paused-expected.checksum
LayoutTests/platform/mac/media/video-seek-past-end-paused-expected.png
LayoutTests/platform/mac/media/video-seek-past-end-playing-expected.checksum
LayoutTests/platform/mac/media/video-seek-past-end-playing-expected.png
LayoutTests/platform/mac/media/video-seekable-expected.checksum
LayoutTests/platform/mac/media/video-seekable-expected.png
LayoutTests/platform/mac/media/video-seeking-expected.checksum
LayoutTests/platform/mac/media/video-seeking-expected.png
LayoutTests/platform/mac/media/video-size-expected.checksum
LayoutTests/platform/mac/media/video-size-expected.png
LayoutTests/platform/mac/media/video-source-expected.checksum
LayoutTests/platform/mac/media/video-source-expected.png
LayoutTests/platform/mac/media/video-source-media-expected.checksum
LayoutTests/platform/mac/media/video-source-media-expected.png
LayoutTests/platform/mac/media/video-source-type-expected.checksum
LayoutTests/platform/mac/media/video-source-type-expected.png
LayoutTests/platform/mac/media/video-src-change-expected.checksum
LayoutTests/platform/mac/media/video-src-change-expected.png
LayoutTests/platform/mac/media/video-src-expected.checksum
LayoutTests/platform/mac/media/video-src-expected.png
LayoutTests/platform/mac/media/video-src-remove-expected.checksum
LayoutTests/platform/mac/media/video-src-remove-expected.png
LayoutTests/platform/mac/media/video-src-set-expected.checksum
LayoutTests/platform/mac/media/video-src-set-expected.png
LayoutTests/platform/mac/media/video-src-source-expected.checksum
LayoutTests/platform/mac/media/video-src-source-expected.png
LayoutTests/platform/mac/media/video-start-expected.checksum
LayoutTests/platform/mac/media/video-start-expected.png
LayoutTests/platform/mac/media/video-volume-expected.checksum
LayoutTests/platform/mac/media/video-volume-expected.png
LayoutTests/platform/mac/media/video-width-height-expected.checksum
LayoutTests/platform/mac/media/video-width-height-expected.png
WebCore/ChangeLog
WebCore/css/html4.css
WebCore/rendering/RenderSlider.cpp

index c1675cc..475d5d2 100644 (file)
@@ -1,3 +1,100 @@
+2008-01-25  Adele Peterson  <adele@apple.com>
+
+        Reviewed by Sam.
+
+        Adding new test and updated results for:
+        <rdar://problem/5679452> Finish tweaking layout/alignment of media controls slider to match QuickTime plug-in
+
+        * fast/forms/slider-padding.html: Added.
+        * platform/mac/fast/forms/slider-padding-expected.checksum: Added.
+        * platform/mac/fast/forms/slider-padding-expected.png: Added.
+        * platform/mac/fast/forms/slider-padding-expected.txt: Added.
+        * platform/mac/media/audio-controls-rendering-expected.checksum:
+        * platform/mac/media/audio-controls-rendering-expected.png:
+        * platform/mac/media/audio-controls-rendering-expected.txt:
+        * platform/mac/media/broken-video-expected.checksum:
+        * platform/mac/media/broken-video-expected.png:
+        * platform/mac/media/progress-event-expected.checksum:
+        * platform/mac/media/progress-event-expected.png:
+        * platform/mac/media/unsupported-rtsp-expected.checksum:
+        * platform/mac/media/unsupported-rtsp-expected.png:
+        * platform/mac/media/unsupported-tracks-expected.checksum:
+        * platform/mac/media/unsupported-tracks-expected.png:
+        * platform/mac/media/video-append-source-expected.checksum:
+        * platform/mac/media/video-append-source-expected.png:
+        * platform/mac/media/video-autoplay-expected.checksum:
+        * platform/mac/media/video-autoplay-expected.png:
+        * platform/mac/media/video-buffered-expected.checksum:
+        * platform/mac/media/video-buffered-expected.png:
+        * platform/mac/media/video-controls-expected.checksum:
+        * platform/mac/media/video-controls-expected.png:
+        * platform/mac/media/video-controls-rendering-expected.checksum:
+        * platform/mac/media/video-controls-rendering-expected.png:
+        * platform/mac/media/video-controls-rendering-expected.txt:
+        * platform/mac/media/video-currentTime-set2-expected.checksum:
+        * platform/mac/media/video-currentTime-set2-expected.png:
+        * platform/mac/media/video-display-toggle-expected.checksum:
+        * platform/mac/media/video-display-toggle-expected.png:
+        * platform/mac/media/video-display-toggle-expected.txt:
+        * platform/mac/media/video-dom-autoplay-expected.checksum:
+        * platform/mac/media/video-dom-autoplay-expected.png:
+        * platform/mac/media/video-dom-src-expected.checksum:
+        * platform/mac/media/video-dom-src-expected.png:
+        * platform/mac/media/video-dom-start-expected.checksum:
+        * platform/mac/media/video-dom-start-expected.png:
+        * platform/mac/media/video-error-abort-expected.checksum:
+        * platform/mac/media/video-error-abort-expected.png:
+        * platform/mac/media/video-error-does-not-exist-expected.checksum:
+        * platform/mac/media/video-error-does-not-exist-expected.png:
+        * platform/mac/media/video-load-networkState-expected.checksum:
+        * platform/mac/media/video-load-networkState-expected.png:
+        * platform/mac/media/video-load-readyState-expected.checksum:
+        * platform/mac/media/video-load-readyState-expected.png:
+        * platform/mac/media/video-muted-expected.checksum:
+        * platform/mac/media/video-muted-expected.png:
+        * platform/mac/media/video-no-autoplay-expected.checksum:
+        * platform/mac/media/video-no-autoplay-expected.png:
+        * platform/mac/media/video-pause-empty-events-expected.checksum:
+        * platform/mac/media/video-pause-empty-events-expected.png:
+        * platform/mac/media/video-play-empty-events-expected.checksum:
+        * platform/mac/media/video-play-empty-events-expected.png:
+        * platform/mac/media/video-play-pause-events-expected.checksum:
+        * platform/mac/media/video-play-pause-events-expected.png:
+        * platform/mac/media/video-play-pause-exception-expected.checksum:
+        * platform/mac/media/video-play-pause-exception-expected.png:
+        * platform/mac/media/video-seek-past-end-paused-expected.checksum:
+        * platform/mac/media/video-seek-past-end-paused-expected.png:
+        * platform/mac/media/video-seek-past-end-playing-expected.checksum:
+        * platform/mac/media/video-seek-past-end-playing-expected.png:
+        * platform/mac/media/video-seekable-expected.checksum:
+        * platform/mac/media/video-seekable-expected.png:
+        * platform/mac/media/video-seeking-expected.checksum:
+        * platform/mac/media/video-seeking-expected.png:
+        * platform/mac/media/video-size-expected.checksum:
+        * platform/mac/media/video-size-expected.png:
+        * platform/mac/media/video-source-expected.checksum:
+        * platform/mac/media/video-source-expected.png:
+        * platform/mac/media/video-source-media-expected.checksum:
+        * platform/mac/media/video-source-media-expected.png:
+        * platform/mac/media/video-source-type-expected.checksum:
+        * platform/mac/media/video-source-type-expected.png:
+        * platform/mac/media/video-src-change-expected.checksum:
+        * platform/mac/media/video-src-change-expected.png:
+        * platform/mac/media/video-src-expected.checksum:
+        * platform/mac/media/video-src-expected.png:
+        * platform/mac/media/video-src-remove-expected.checksum:
+        * platform/mac/media/video-src-remove-expected.png:
+        * platform/mac/media/video-src-set-expected.checksum:
+        * platform/mac/media/video-src-set-expected.png:
+        * platform/mac/media/video-src-source-expected.checksum:
+        * platform/mac/media/video-src-source-expected.png:
+        * platform/mac/media/video-start-expected.checksum:
+        * platform/mac/media/video-start-expected.png:
+        * platform/mac/media/video-volume-expected.checksum:
+        * platform/mac/media/video-volume-expected.png:
+        * platform/mac/media/video-width-height-expected.checksum:
+        * platform/mac/media/video-width-height-expected.png:
+
 2008-01-25  Antti Koivisto  <koivisto@iki.fi>
 
         <rdar://problem/5674277>
diff --git a/LayoutTests/fast/forms/slider-padding.html b/LayoutTests/fast/forms/slider-padding.html
new file mode 100644 (file)
index 0000000..76892ec
--- /dev/null
@@ -0,0 +1,18 @@
+<html>
+    <head>
+        <script>
+            function log(msg)
+            {
+                document.getElementById("console").appendChild(document.createTextNode(msg + "\n"));
+            }
+        </script>
+    </head>
+    <body>
+        This tests that the slider control considers padding.
+        <br>
+        <div style="background-color: lightblue; ">
+            <input type="range" id="rn" style="padding: 10px; width: 100px;" value=0></input>
+        </div>
+        <pre id="console"></pre>
+    </body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/forms/slider-padding-expected.checksum b/LayoutTests/platform/mac/fast/forms/slider-padding-expected.checksum
new file mode 100644 (file)
index 0000000..e1b67d5
--- /dev/null
@@ -0,0 +1 @@
+373617d8ba49b1db7a831ec9f392596c
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/forms/slider-padding-expected.png b/LayoutTests/platform/mac/fast/forms/slider-padding-expected.png
new file mode 100644 (file)
index 0000000..06c01de
Binary files /dev/null and b/LayoutTests/platform/mac/fast/forms/slider-padding-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/forms/slider-padding-expected.txt b/LayoutTests/platform/mac/fast/forms/slider-padding-expected.txt
new file mode 100644 (file)
index 0000000..d6fd033
--- /dev/null
@@ -0,0 +1,15 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x579
+      RenderBlock (anonymous) at (0,0) size 784x18
+        RenderText {#text} at (0,0) size 321x18
+          text run at (0,0) width 321: "This tests that the slider control considers padding. "
+        RenderBR {BR} at (0,0) size 0x0
+      RenderBlock {DIV} at (0,18) size 784x39 [bgcolor=#ADD8E6]
+        RenderSlider {INPUT} at (2,2) size 100x35 [bgcolor=#FFFFFF]
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {PRE} at (0,70) size 784x0
+layer at (20,38) size 15x15
+  RenderBlock (relative positioned) {DIV} at (10,10) size 15x15
index 17e9686..0f8e0f6 100644 (file)
Binary files a/LayoutTests/platform/mac/media/audio-controls-rendering-expected.png and b/LayoutTests/platform/mac/media/audio-controls-rendering-expected.png differ
index bc8fca8..68e4c6a 100644 (file)
@@ -26,8 +26,8 @@ layer at (24,42) size 17x16
   RenderButton {INPUT} at (16,0) size 17x16
 layer at (40,42) size 136x16
   RenderSlider {INPUT} at (32,0) size 136x16
-layer at (40,43) size 13x14
-  RenderBlock (relative positioned) {DIV} at (0,0) size 13x14
+layer at (42,43) size 13x14
+  RenderBlock (relative positioned) {DIV} at (2,0) size 13x14
 layer at (175,42) size 17x16
   RenderButton {INPUT} at (167,0) size 17x16
 layer at (191,42) size 17x16
@@ -43,8 +43,8 @@ layer at (24,76) size 17x16
   RenderButton {INPUT} at (16,0) size 17x16
 layer at (40,76) size 256x16
   RenderSlider {INPUT} at (32,0) size 256x16
-layer at (40,77) size 13x14
-  RenderBlock (relative positioned) {DIV} at (0,0) size 13x14
+layer at (42,77) size 13x14
+  RenderBlock (relative positioned) {DIV} at (2,0) size 13x14
 layer at (295,76) size 17x16
   RenderButton {INPUT} at (287,0) size 17x16
 layer at (311,76) size 17x16
@@ -62,8 +62,8 @@ layer at (24,194) size 17x16
   RenderButton {INPUT} at (16,0) size 17x16
 layer at (40,194) size 256x16
   RenderSlider {INPUT} at (32,0) size 256x16
-layer at (40,195) size 13x14
-  RenderBlock (relative positioned) {DIV} at (0,0) size 13x14
+layer at (42,195) size 13x14
+  RenderBlock (relative positioned) {DIV} at (2,0) size 13x14
 layer at (295,194) size 17x16
   RenderButton {INPUT} at (287,0) size 17x16
 layer at (311,194) size 17x16
index 6caaf3a..7271028 100644 (file)
@@ -1 +1 @@
-72779af0b045979874c7cdb01c0fff54
\ No newline at end of file
+d88e45d7e945c2323fd2ccafcce2912a
\ No newline at end of file
index 11f2b74..9fb4966 100644 (file)
Binary files a/LayoutTests/platform/mac/media/broken-video-expected.png and b/LayoutTests/platform/mac/media/broken-video-expected.png differ
index 3e397e5..643b273 100644 (file)
@@ -1 +1 @@
-c2f1007fdd7cb0102e12cc02f822649c
\ No newline at end of file
+a8d47d32eb22de7a18f34f0289b6d446
\ No newline at end of file
index c577dfd..855d93f 100644 (file)
Binary files a/LayoutTests/platform/mac/media/progress-event-expected.png and b/LayoutTests/platform/mac/media/progress-event-expected.png differ
index f54003e..5d55fed 100644 (file)
@@ -1 +1 @@
-5521494e653eb2f5396f76a1a256afed
\ No newline at end of file
+865351f87a2454e79a5876e2827fa332
\ No newline at end of file
index 8932667..63e2777 100644 (file)
Binary files a/LayoutTests/platform/mac/media/unsupported-rtsp-expected.png and b/LayoutTests/platform/mac/media/unsupported-rtsp-expected.png differ
index 1d6b906..3e42b4a 100644 (file)
@@ -1 +1 @@
-eb3a861a7f7c811e80a63da1492766fe
\ No newline at end of file
+a170af2cafc19682e8a76c533101ad65
\ No newline at end of file
index b13493d..3ed5e26 100644 (file)
Binary files a/LayoutTests/platform/mac/media/unsupported-tracks-expected.png and b/LayoutTests/platform/mac/media/unsupported-tracks-expected.png differ
index 1437c29..b2c22ba 100644 (file)
Binary files a/LayoutTests/platform/mac/media/video-append-source-expected.png and b/LayoutTests/platform/mac/media/video-append-source-expected.png differ
index 477e280..1b7f8e7 100644 (file)
@@ -1 +1 @@
-f8b0686eed33873d958027d2bfb142e2
\ No newline at end of file
+0b7c17174eb1006a3f3e9c1f7f7083c2
\ No newline at end of file
index 1fa3b15..aac2b17 100644 (file)
Binary files a/LayoutTests/platform/mac/media/video-autoplay-expected.png and b/LayoutTests/platform/mac/media/video-autoplay-expected.png differ
index ecd8c71..bfc2de4 100644 (file)
@@ -1 +1 @@
-91484047305794bf744a3c6d2576c2ec
\ No newline at end of file
+d9f9cb6adba2a821040bc15c8567c72e
\ No newline at end of file
index 886aeff..6f9eecb 100644 (file)
Binary files a/LayoutTests/platform/mac/media/video-buffered-expected.png and b/LayoutTests/platform/mac/media/video-buffered-expected.png differ
index 039ec2c..6bc7aa9 100644 (file)
@@ -1 +1 @@
-b60c11fcb2c830568918656591feeb1d
\ No newline at end of file
+83d3cc77ed048666e41a28bb446a779d
\ No newline at end of file
index a037bbe..704cc99 100644 (file)
Binary files a/LayoutTests/platform/mac/media/video-controls-expected.png and b/LayoutTests/platform/mac/media/video-controls-expected.png differ
index eaa2c84..ac3c87c 100644 (file)
Binary files a/LayoutTests/platform/mac/media/video-controls-rendering-expected.png and b/LayoutTests/platform/mac/media/video-controls-rendering-expected.png differ
index ae21982..b80bb28 100644 (file)
@@ -24,8 +24,8 @@ layer at (24,266) size 17x16
   RenderButton {INPUT} at (16,0) size 17x16
 layer at (40,266) size 256x16
   RenderSlider {INPUT} at (32,0) size 256x16
-layer at (40,267) size 13x14
-  RenderBlock (relative positioned) {DIV} at (0,0) size 13x14
+layer at (42,267) size 13x14
+  RenderBlock (relative positioned) {DIV} at (2,0) size 13x14
 layer at (295,266) size 17x16
   RenderButton {INPUT} at (287,0) size 17x16
 layer at (311,266) size 17x16
@@ -41,8 +41,8 @@ layer at (24,506) size 17x16
   RenderButton {INPUT} at (16,0) size 17x16
 layer at (40,506) size 256x16
   RenderSlider {INPUT} at (32,0) size 256x16
-layer at (40,507) size 13x14
-  RenderBlock (relative positioned) {DIV} at (0,0) size 13x14
+layer at (42,507) size 13x14
+  RenderBlock (relative positioned) {DIV} at (2,0) size 13x14
 layer at (295,506) size 17x16
   RenderButton {INPUT} at (287,0) size 17x16
 layer at (311,506) size 17x16
@@ -60,8 +60,8 @@ layer at (24,746) size 17x16
   RenderButton {INPUT} at (16,0) size 17x16
 layer at (40,746) size 256x16
   RenderSlider {INPUT} at (32,0) size 256x16
-layer at (40,747) size 13x14
-  RenderBlock (relative positioned) {DIV} at (0,0) size 13x14
+layer at (42,747) size 13x14
+  RenderBlock (relative positioned) {DIV} at (2,0) size 13x14
 layer at (295,746) size 17x16
   RenderButton {INPUT} at (287,0) size 17x16
 layer at (311,746) size 17x16
index 88043fa..671c529 100644 (file)
Binary files a/LayoutTests/platform/mac/media/video-currentTime-set2-expected.png and b/LayoutTests/platform/mac/media/video-currentTime-set2-expected.png differ
index 4b5228b..dbc3ef2 100644 (file)
Binary files a/LayoutTests/platform/mac/media/video-display-toggle-expected.png and b/LayoutTests/platform/mac/media/video-display-toggle-expected.png differ
index 497a74c..c3e8d3d 100644 (file)
@@ -21,8 +21,8 @@ layer at (24,250) size 17x16
   RenderButton {INPUT} at (16,0) size 17x16
 layer at (40,250) size 256x16
   RenderSlider {INPUT} at (32,0) size 256x16
-layer at (40,251) size 13x14
-  RenderBlock (relative positioned) {DIV} at (0,0) size 13x14
+layer at (42,251) size 13x14
+  RenderBlock (relative positioned) {DIV} at (2,0) size 13x14
 layer at (295,250) size 17x16
   RenderButton {INPUT} at (287,0) size 17x16
 layer at (311,250) size 17x16
index 9fc823c..c8e5b1f 100644 (file)
@@ -1 +1 @@
-9bdffc2cc625b3f9399711ea7cd6bf16
\ No newline at end of file
+493055f1db8803f867b25a028224d1fe
\ No newline at end of file
index 04e6604..5cba70b 100644 (file)
Binary files a/LayoutTests/platform/mac/media/video-dom-autoplay-expected.png and b/LayoutTests/platform/mac/media/video-dom-autoplay-expected.png differ
index a61c6b8..c53ab30 100644 (file)
@@ -1 +1 @@
-d2d64d1ced05a002baf029d7d7af3b0f
\ No newline at end of file
+b75a8f2dc350ef39b60acbb6381d865f
\ No newline at end of file
index 1437c29..b2c22ba 100644 (file)
Binary files a/LayoutTests/platform/mac/media/video-dom-src-expected.png and b/LayoutTests/platform/mac/media/video-dom-src-expected.png differ
index 70c8040..a3bf7d4 100644 (file)
@@ -1 +1 @@
-177badf39dffae54d831ba4d22f1b57b
\ No newline at end of file
+bde3af54453076d86503ff37dcda6403
\ No newline at end of file
index 1f94d1d..43e7847 100644 (file)
Binary files a/LayoutTests/platform/mac/media/video-dom-start-expected.png and b/LayoutTests/platform/mac/media/video-dom-start-expected.png differ
index ac2e54e..e15b439 100644 (file)
@@ -1 +1 @@
-6b82b4a09539373d6149acd35b221a34
\ No newline at end of file
+2cea039a883dfe012f03e1bb5df6fc95
\ No newline at end of file
index 0d39a73..cddee66 100644 (file)
Binary files a/LayoutTests/platform/mac/media/video-error-abort-expected.png and b/LayoutTests/platform/mac/media/video-error-abort-expected.png differ
index 14e00f8..3194a3f 100644 (file)
Binary files a/LayoutTests/platform/mac/media/video-error-does-not-exist-expected.png and b/LayoutTests/platform/mac/media/video-error-does-not-exist-expected.png differ
index 03ca066..cbcbc6b 100644 (file)
Binary files a/LayoutTests/platform/mac/media/video-load-networkState-expected.png and b/LayoutTests/platform/mac/media/video-load-networkState-expected.png differ
index 86b03dc..20420ca 100644 (file)
Binary files a/LayoutTests/platform/mac/media/video-load-readyState-expected.png and b/LayoutTests/platform/mac/media/video-load-readyState-expected.png differ
index b1e8d3b..5fe5938 100644 (file)
@@ -1 +1 @@
-a7b5d88af6a11b7900e294118812d7ff
\ No newline at end of file
+01aa83bc5ff3067c514204a4e20cf67a
\ No newline at end of file
index 6088539..6acf8a8 100644 (file)
Binary files a/LayoutTests/platform/mac/media/video-muted-expected.png and b/LayoutTests/platform/mac/media/video-muted-expected.png differ
index 4286349..56da055 100644 (file)
@@ -1 +1 @@
-2e1331e1a9428756fbe98e7414d81f45
\ No newline at end of file
+012e5623ba22876e791515783c7957d6
\ No newline at end of file
index b5e154a..de4190e 100644 (file)
Binary files a/LayoutTests/platform/mac/media/video-no-autoplay-expected.png and b/LayoutTests/platform/mac/media/video-no-autoplay-expected.png differ
index ef824f2..9f60312 100644 (file)
Binary files a/LayoutTests/platform/mac/media/video-pause-empty-events-expected.png and b/LayoutTests/platform/mac/media/video-pause-empty-events-expected.png differ
index 51c74f2..d6491d8 100644 (file)
Binary files a/LayoutTests/platform/mac/media/video-play-empty-events-expected.png and b/LayoutTests/platform/mac/media/video-play-empty-events-expected.png differ
index 263673e..1b50d77 100644 (file)
Binary files a/LayoutTests/platform/mac/media/video-play-pause-events-expected.png and b/LayoutTests/platform/mac/media/video-play-pause-events-expected.png differ
index e582b7b..b80ce12 100644 (file)
Binary files a/LayoutTests/platform/mac/media/video-play-pause-exception-expected.png and b/LayoutTests/platform/mac/media/video-play-pause-exception-expected.png differ
index 78c5d91..f017eb6 100644 (file)
Binary files a/LayoutTests/platform/mac/media/video-seek-past-end-paused-expected.png and b/LayoutTests/platform/mac/media/video-seek-past-end-paused-expected.png differ
index 86aea0a..645fccf 100644 (file)
Binary files a/LayoutTests/platform/mac/media/video-seek-past-end-playing-expected.png and b/LayoutTests/platform/mac/media/video-seek-past-end-playing-expected.png differ
index a89e456..106fbdb 100644 (file)
@@ -1 +1 @@
-d9455ba79721de17b92c37c43d9f8413
\ No newline at end of file
+53e72ccc33e9f2800a2545b8828fe39a
\ No newline at end of file
index 1270b25..b2fd4df 100644 (file)
Binary files a/LayoutTests/platform/mac/media/video-seekable-expected.png and b/LayoutTests/platform/mac/media/video-seekable-expected.png differ
index 78fcc5f..4fee9bc 100644 (file)
@@ -1 +1 @@
-6fd1dc5a67e48df2b4f9b9902d0028d4
\ No newline at end of file
+c0767e3b6d82b59719fa95913eeaab0f
\ No newline at end of file
index bbc15c4..2bd59cc 100644 (file)
Binary files a/LayoutTests/platform/mac/media/video-seeking-expected.png and b/LayoutTests/platform/mac/media/video-seeking-expected.png differ
index 15a2732..53f09d1 100644 (file)
@@ -1 +1 @@
-aae5f8831555e3136c7b5f205e55b94a
\ No newline at end of file
+3da5662beb336caaba2fbca99bda4584
\ No newline at end of file
index f48f0f8..f3486ff 100644 (file)
Binary files a/LayoutTests/platform/mac/media/video-size-expected.png and b/LayoutTests/platform/mac/media/video-size-expected.png differ
index bf4b8f8..dc53930 100644 (file)
@@ -1 +1 @@
-d239ccd632f1f1f4b6bb58307bff2cd9
\ No newline at end of file
+606be066ee1e547f99e34df2a6f1b005
\ No newline at end of file
index 9785f6a..93029c9 100644 (file)
Binary files a/LayoutTests/platform/mac/media/video-source-expected.png and b/LayoutTests/platform/mac/media/video-source-expected.png differ
index bf4b8f8..dc53930 100644 (file)
@@ -1 +1 @@
-d239ccd632f1f1f4b6bb58307bff2cd9
\ No newline at end of file
+606be066ee1e547f99e34df2a6f1b005
\ No newline at end of file
index 9785f6a..93029c9 100644 (file)
Binary files a/LayoutTests/platform/mac/media/video-source-media-expected.png and b/LayoutTests/platform/mac/media/video-source-media-expected.png differ
index bf4b8f8..dc53930 100644 (file)
@@ -1 +1 @@
-d239ccd632f1f1f4b6bb58307bff2cd9
\ No newline at end of file
+606be066ee1e547f99e34df2a6f1b005
\ No newline at end of file
index 9785f6a..93029c9 100644 (file)
Binary files a/LayoutTests/platform/mac/media/video-source-type-expected.png and b/LayoutTests/platform/mac/media/video-source-type-expected.png differ
index 517b6f7..f269617 100644 (file)
@@ -1 +1 @@
-523b78ac5f616e75e97ea8a5ffb79745
\ No newline at end of file
+62ed180b3546254007e774a5ee029046
\ No newline at end of file
index 2f205f0..cedf40a 100644 (file)
Binary files a/LayoutTests/platform/mac/media/video-src-change-expected.png and b/LayoutTests/platform/mac/media/video-src-change-expected.png differ
index bf4b8f8..dc53930 100644 (file)
@@ -1 +1 @@
-d239ccd632f1f1f4b6bb58307bff2cd9
\ No newline at end of file
+606be066ee1e547f99e34df2a6f1b005
\ No newline at end of file
index 9785f6a..93029c9 100644 (file)
Binary files a/LayoutTests/platform/mac/media/video-src-expected.png and b/LayoutTests/platform/mac/media/video-src-expected.png differ
index 3ba939d..44b9a74 100644 (file)
@@ -1 +1 @@
-f6780a8cf73ec1b56770566407315419
\ No newline at end of file
+2cf72bf4602196b00f733a42d4e5d326
\ No newline at end of file
index d44e934..78e4980 100644 (file)
Binary files a/LayoutTests/platform/mac/media/video-src-remove-expected.png and b/LayoutTests/platform/mac/media/video-src-remove-expected.png differ
index 7fac980..2043fa7 100644 (file)
@@ -1 +1 @@
-2f9c0045ae23b65e5e0c2be5510e95c9
\ No newline at end of file
+d172dbfa470a21c59539bf80000e8d6b
\ No newline at end of file
index 9a52d2c..417445d 100644 (file)
Binary files a/LayoutTests/platform/mac/media/video-src-set-expected.png and b/LayoutTests/platform/mac/media/video-src-set-expected.png differ
index bf4b8f8..dc53930 100644 (file)
@@ -1 +1 @@
-d239ccd632f1f1f4b6bb58307bff2cd9
\ No newline at end of file
+606be066ee1e547f99e34df2a6f1b005
\ No newline at end of file
index 9785f6a..93029c9 100644 (file)
Binary files a/LayoutTests/platform/mac/media/video-src-source-expected.png and b/LayoutTests/platform/mac/media/video-src-source-expected.png differ
index 3df3fc3..f6f4a4e 100644 (file)
@@ -1 +1 @@
-a9b2e3508618127e60df8738a9bc4acd
\ No newline at end of file
+8aa1c0792ea039c711a63e134f8fef01
\ No newline at end of file
index 1b13241..f36f11f 100644 (file)
Binary files a/LayoutTests/platform/mac/media/video-start-expected.png and b/LayoutTests/platform/mac/media/video-start-expected.png differ
index 4c2bec6..443dbdf 100644 (file)
@@ -1 +1 @@
-4343c02e7e65a518d8b99c7583c047d3
\ No newline at end of file
+e12a959ac63de32b21aad142a44abafa
\ No newline at end of file
index 02940f7..d5ef7c5 100644 (file)
Binary files a/LayoutTests/platform/mac/media/video-volume-expected.png and b/LayoutTests/platform/mac/media/video-volume-expected.png differ
index 7382370..726d398 100644 (file)
@@ -1 +1 @@
-21358631a78fc65a69ae3adc9578afd7
\ No newline at end of file
+fe56b7b8776dc2746a9b722bf587b7e2
\ No newline at end of file
index 60fb709..f500b62 100644 (file)
Binary files a/LayoutTests/platform/mac/media/video-width-height-expected.png and b/LayoutTests/platform/mac/media/video-width-height-expected.png differ
index 0f71af5..3d7c644 100644 (file)
@@ -1,3 +1,16 @@
+2008-01-25  Adele Peterson  <adele@apple.com>
+
+        Reviewed by Sam.
+
+        Fix for <rdar://problem/5679452> Finish tweaking layout/alignment of media controls slider to match QuickTime plug-in
+
+        * css/html4.css: Add horizontal padding to the media slider.
+        * rendering/RenderSlider.cpp:
+        (WebCore::HTMLSliderThumbElement::defaultEventHandler): Replace use of absoluteBoundingBox() with width() and height()
+        (WebCore::RenderSlider::positionForOffset): ditto. Also, use the trackSize() for the maximum offset.
+        (WebCore::RenderSlider::layout):  Use contentWidth() and contentHeight() to take padding into account.
+        (WebCore::RenderSlider::trackSize): ditto.
+
 2008-01-24  Adam Roben  <aroben@apple.com>
 
         Better fix for Bug 16996
index f266265..65ec4e5 100644 (file)
@@ -629,6 +629,7 @@ audio::-webkit-media-controls-timeline, video::-webkit-media-controls-timeline {
     left: 32px;
     right: 32px;
     height: 16px;
+    padding: 0px 2px;
 }
 
 audio::-webkit-media-controls-seek-back-button, video::-webkit-media-controls-seek-back-button {
index af63411..8e60fc7 100644 (file)
@@ -102,9 +102,9 @@ void HTMLSliderThumbElement::defaultEventHandler(Event* event)
             RenderSlider* slider = static_cast<RenderSlider*>(renderer()->parent());
             int newPosition = slider->positionForOffset(
                 IntPoint(m_initialPosition + mouseEvent->pageX() - m_initialClickPoint.x()
-                        + (renderer()->absoluteBoundingBoxRect().width() / 2), 
+                        + (renderer()->width() / 2), 
                     m_initialPosition + mouseEvent->pageY() - m_initialClickPoint.y()
-                        + (renderer()->absoluteBoundingBoxRect().height() / 2)));
+                        + (renderer()->height() / 2)));
             if (slider->currentPosition() != newPosition) {
                 slider->setCurrentPosition(newPosition);
                 slider->valueChanged();
@@ -227,10 +227,10 @@ void RenderSlider::layout()
 
         if (style()->appearance() == SliderVerticalAppearance) {
             // FIXME: Handle percentage widths correctly. See http://bugs.webkit.org/show_bug.cgi?id=12104
-            m_thumb->renderer()->style()->setLeft(Length(m_width / 2 - m_thumb->renderer()->style()->width().value() / 2, Fixed));
+            m_thumb->renderer()->style()->setLeft(Length(contentWidth() / 2 - m_thumb->renderer()->style()->width().value() / 2, Fixed));
         } else {
             // FIXME: Handle percentage heights correctly. See http://bugs.webkit.org/show_bug.cgi?id=12104
-            m_thumb->renderer()->style()->setTop(Length(m_height / 2 - m_thumb->renderer()->style()->height().value() / 2, Fixed));
+            m_thumb->renderer()->style()->setTop(Length(contentHeight() / 2 - m_thumb->renderer()->style()->height().value() / 2, Fixed));
         }
 
         if (relayoutChildren)
@@ -338,14 +338,12 @@ int RenderSlider::positionForOffset(const IntPoint& p)
         return 0;
    
     int position;
-    if (style()->appearance() == SliderVerticalAppearance) {
-        position = max(0, min(p.y() - (m_thumb->renderer()->absoluteBoundingBoxRect().height() / 2), 
-                              absoluteBoundingBoxRect().height() - m_thumb->renderer()->absoluteBoundingBoxRect().height()));
-    } else {
-        position = max(0, min(p.x() - (m_thumb->renderer()->absoluteBoundingBoxRect().width() / 2), 
-                              absoluteBoundingBoxRect().width() - m_thumb->renderer()->absoluteBoundingBoxRect().width()));
-    }
-    return position;
+    if (style()->appearance() == SliderVerticalAppearance)
+        position = p.y() - m_thumb->renderer()->height() / 2;
+    else
+        position = p.x() - m_thumb->renderer()->width() / 2;
+    
+    return max(0, min(position, trackSize()));
 }
 
 void RenderSlider::valueChanged()
@@ -384,8 +382,8 @@ int RenderSlider::trackSize()
         return 0;
 
     if (style()->appearance() == SliderVerticalAppearance)
-        return absoluteBoundingBoxRect().height() - m_thumb->renderer()->absoluteBoundingBoxRect().height();
-    return absoluteBoundingBoxRect().width() - m_thumb->renderer()->absoluteBoundingBoxRect().width();
+        return contentHeight() - m_thumb->renderer()->height();
+    return contentWidth() - m_thumb->renderer()->width();
 }
 
 void RenderSlider::forwardEvent(Event* evt)