2011-04-28 Steve Lacey <sjl@chromium.org>

        Reviewed by Eric Carlson.

        Change chromium media controls to use absolute positioning until bug 59644 is fixed.
        https://bugs.webkit.org/show_bug.cgi?id=59732

        * platform/chromium/test_expectations.txt: Add expectations for affected tests.
2011-04-28  Steve Lacey  <sjl@chromium.org>

        Reviewed by Eric Carlson.

        Change chromium media controls to use absolute positioning until bug 59644 is fixed.
        https://bugs.webkit.org/show_bug.cgi?id=59732

        * css/mediaControlsChromium.css:
        (audio::-webkit-media-controls-current-time-display, video::-webkit-media-controls-current-time-display):
        (audio::-webkit-media-controls-timeline, video::-webkit-media-controls-timeline):

Canonical link: https://commits.webkit.org/74997@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@85290 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog

@@ -1,3 +1,12 @@
+2011-04-28  Steve Lacey  <sjl@chromium.org>
+
+        Reviewed by Eric Carlson.
+
+        Change chromium media controls to use absolute positioning until bug 59644 is fixed.
+        https://bugs.webkit.org/show_bug.cgi?id=59732
+
+        * platform/chromium/test_expectations.txt: Add expectations for affected tests.
+
 2011-04-28  Julien Chaffraix  <jchaffraix@codeaurora.org>
 
         Reviewed by Darin Adler.

LayoutTests/platform/chromium/test_expectations.txt

@@ -2991,7 +2991,7 @@ BUGCR72861 : fast/css/test-setting-canvas-color.html = TEXT
 // need rebaseline.
 BUGWK54499 LINUX : svg/transforms/text-with-pattern-with-svg-transform.svg = IMAGE
 
-BUGWK54472 : media/audio-delete-while-slider-thumb-clicked.html = TIMEOUT
+BUGWK54472 BUGCR74826 : media/audio-delete-while-slider-thumb-clicked.html = TEXT TIMEOUT
 
 // Flaky
 BUGCR73080 LINUX DEBUG : fast/forms/form-attribute-elements-order.html = PASS TIMEOUT
@@ -3656,13 +3656,22 @@ BUGDPRANKE : fast/layers/video-layer.html = IMAGE
 BUGDPRANKE : fast/overflow/border-radius-clipping.html = IMAGE
 BUGDPRANKE WIN LINUX : fast/repaint/border-radius-repaint.html = IMAGE
 BUGDPRANKE WIN LINUX : fast/replaced/border-radius-clip.html = IMAGE
-BUGDPRANKE : media/audio-controls-rendering.html = IMAGE
-BUGDPRANKE : media/video-display-toggle.html = IMAGE
-BUGDPRANKE : media/video-empty-source.html = IMAGE
-BUGDPRANKE : media/video-no-audio.html = IMAGE
-BUGDPRANKE CPU : media/video-volume-slider.html = IMAGE
 BUGDPRANKE : svg/custom/svg-fonts-in-html.html = IMAGE
 
+// Needs a rebaseline after moving controls to absolute positioning
+BUGCR74826 : media/audio-controls-rendering.html = IMAGE+TEXT
+BUGCR74826 CPU : media/media-document-audio-repaint.html = IMAGE+TEXT
+BUGCR74826 CPU : media/video-controls-rendering.html = IMAGE+TEXT
+BUGCR74826 : media/video-display-toggle.html = IMAGE+TEXT
+BUGCR74826 : media/video-empty-source.html = IMAGE+TEXT
+BUGCR74826 : media/video-no-audio.html = IMAGE+TEXT
+BUGCR74826 CPU : media/video-volume-slider.html = IMAGE+TEXT
+BUGCR74826 : media/video-zoom-controls.html = IMAGE+TEXT
+BUGCR74826 : media/controls-after-reload.html = TEXT
+BUGCR74826 : media/controls-strict.html = TEXT
+BUGCR74826 : media/controls-styling.html = TEXT
+BUGCR74826 : media/controls-without-preload.html = TEXT
+
 // probably just needs a new baseline
 BUGDPRANKE WIN LINUX : fast/backgrounds/background-leakage-transforms.html = IMAGE+TEXT
 
@@ -3672,13 +3681,11 @@ BUGDPRANKE SLOW : fast/css/visited-link-hang.html = PASS
 // webkit roll : 84350:84431
 BUGDPRANKE LINUX : fast/canvas/webgl/css-webkit-canvas-repaint.html = IMAGE
 BUGDPRANKE LINUX : fast/canvas/webgl/css-webkit-canvas.html = IMAGE
-BUGDPRANKE CPU : media/media-document-audio-repaint.html = IMAGE
 BUGDPRANKE MAC LINUX : transitions/interrupt-zero-duration.html = TEXT PASS
 BUGDPRANKE : media/controls-css-overload.html = TIMEOUT PASS
 BUGDPRANKE WIN LINUX : fast/borders/bidi-012.html = IMAGE+TEXT
 BUGDPRANKE MAC LEOPARD : fast/borders/bidi-012.html = IMAGE
 BUGDPRANKE WIN LINUX : animations/change-one-anim.html = TEXT PASS
-BUGDPRANKE CPU : media/video-controls-rendering.html = IMAGE
 
 // pulled in from downstream during webkit roll 84350:84431
 BUGCASEQ WIN LINUX : editing/selection/select-from-textfield-outwards.html = IMAGE+TEXT

Source/WebCore/ChangeLog

@@ -1,3 +1,14 @@
+2011-04-28  Steve Lacey  <sjl@chromium.org>
+
+        Reviewed by Eric Carlson.
+
+        Change chromium media controls to use absolute positioning until bug 59644 is fixed.
+        https://bugs.webkit.org/show_bug.cgi?id=59732
+
+        * css/mediaControlsChromium.css:
+        (audio::-webkit-media-controls-current-time-display, video::-webkit-media-controls-current-time-display):
+        (audio::-webkit-media-controls-timeline, video::-webkit-media-controls-timeline):
+
 2011-04-28  Luke Macpherson   <macpherson@chromium.org>
 
         Reviewed by Eric Seidel.

Source/WebCore/css/mediaControlsChromium.css

@@ -102,6 +102,10 @@ audio::-webkit-media-controls-current-time-display, video::-webkit-media-control
     overflow: hidden;
     cursor: default;
 
+    position: absolute;
+    top: 6px;
+    right: 0;
+
     line-height: 21px;
     height: 20px;
     width: 58px;
@@ -126,8 +130,13 @@ audio::-webkit-media-controls-timeline, video::-webkit-media-controls-timeline {
     box-sizing: border-box;
     -webkit-box-flex: 1;
 
+    position: absolute;
+    top: 7px;
+    left: 6px;
+    right: 64px;
+
     padding: 0px;
-    margin: 0px 6px;
+    margin: 0px;
     height: 18px;
 
     border-color: rgba(255, 255, 255, 0.2);