Attachment 136449 Details for Bug 82150 – Same patch. New baselines for Mac.

[patch] Same patch. New baselines for Mac.

bug-82150-20120410170916.patch (text/plain), 30.89 KB, created by Victor Carbune on 2012-04-10 07:09:18 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Victor Carbune

Created: 2012-04-10 07:09:18 PDT

Size: 30.89 KB

patch

obsolete

>Subversion Revision: 113710
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 0fdcf7197fa80359857857b460aece77dee9153f..2a1f52fae36d022c470260c9e8ec3acebfe94f8c 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,29 @@
>+2012-04-10  Victor Carbune  <vcarbune@adobe.com>
>+
>+        Simplify volume slider rendering
>+        https://bugs.webkit.org/show_bug.cgi?id=82150
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Test: media/video-controls-rendering-toggle-display-none.html
>+
>+        * css/mediaControlsChromium.css: Update controls css for Chromium.
>+        (audio::-webkit-media-controls-panel, video::-webkit-media-controls-panel):
>+        (audio::-webkit-media-controls-mute-button, video::-webkit-media-controls-mute-button):
>+        (audio::-webkit-media-controls-volume-slider-container, video::-webkit-media-controls-volume-slider-container):
>+        * css/mediaControlsQuickTime.css: Update controls css for Safari.
>+        (audio::-webkit-media-controls-volume-slider-container, video::-webkit-media-controls-volume-slider-container):
>+        * html/shadow/MediaControlElements.cpp: Removed particular renderer.
>+        (WebCore):
>+        * html/shadow/MediaControlElements.h:
>+        (MediaControlVolumeSliderContainerElement): Removed particular renderer.
>+        * html/shadow/MediaControlRootElement.cpp:
>+        (WebCore::MediaControlRootElement::create): Added a div element as a container. Removed extra
>+        unused mute button.
>+        * html/shadow/MediaControlRootElementChromium.cpp: Added an extra div element as a container for
>+        the mute button and the volume slider to easily position them relative to each other.
>+        (WebCore::MediaControlRootElementChromium::create):
>+
> 2012-04-10  Rob Buis  <rbuis@rim.com>
> 
>         getElementsByTagName unable to find SVG camelCase elements imported into HTML
>diff --git a/Source/WebCore/css/mediaControlsChromium.css b/Source/WebCore/css/mediaControlsChromium.css
>index 5fb62cc34db11e670eb10e1b5256fc26ee14d8d9..7323f2a46a232cbe554dc3c60fe45aef029656a7 100644
>--- a/Source/WebCore/css/mediaControlsChromium.css
>+++ b/Source/WebCore/css/mediaControlsChromium.css
>@@ -41,6 +41,7 @@ audio:-webkit-full-page-media, video:-webkit-full-page-media {
> 
> audio::-webkit-media-controls-panel, video::-webkit-media-controls-panel {
>     -webkit-user-select: none;
>+    -webkit-box-pack: end;
>     position: relative;
>     overflow: visible;
>     bottom: 0;
>@@ -54,9 +55,13 @@ video:-webkit-full-page-media::-webkit-media-controls-panel {
>     bottom: 0px;
> }
> 
>+audio::-webkit-media-controls-panel, video::-webkit-media-controls-panel {
>+    -webkit-box-align: end;
>+}
>+
> audio::-webkit-media-controls-mute-button, video::-webkit-media-controls-mute-button {
>     -webkit-appearance: media-mute-button;
>-    position: absolute;
>+    position: relative;
>     top: auto;
>     bottom: 0;
>     right: 0;
>@@ -149,7 +154,7 @@ audio::-webkit-media-controls-timeline, video::-webkit-media-controls-timeline {
> 
> audio::-webkit-media-controls-volume-slider-container, video::-webkit-media-controls-volume-slider-container {
>     -webkit-appearance: media-volume-slider-container;
>-    position: absolute;
>+    position: relative;
> 
>     width: 34px;
>     height: 100px;
>diff --git a/Source/WebCore/css/mediaControlsQuickTime.css b/Source/WebCore/css/mediaControlsQuickTime.css
>index 5866a916f17529fa9daac2494d94628fd644976a..a7e5f41bcf2500a2fa539eb8302068be8c4196bc 100644
>--- a/Source/WebCore/css/mediaControlsQuickTime.css
>+++ b/Source/WebCore/css/mediaControlsQuickTime.css
>@@ -48,6 +48,9 @@ audio::-webkit-media-controls-mute-button, video::-webkit-media-controls-mute-bu
>     margin-left: 2px;
>     margin-right: 9px;
>     border: none !important;
>+
>+    position: relative;
>+    z-index: 2;
> }
> 
> audio::-webkit-media-controls-play-button, video::-webkit-media-controls-play-button {
>@@ -200,8 +203,8 @@ audio::-webkit-media-controls-volume-slider-container, video::-webkit-media-cont
>     -webkit-appearance: media-volume-slider-container;
>     position: absolute;
> 
>-    top: 0;
>-    left: 0;
>+    bottom: 0px;
>+    z-index: 1;
> 
>     width: 22px;
>     height: 114px;
>@@ -218,16 +221,3 @@ audio::-webkit-media-controls-volume-slider, video::-webkit-media-controls-volum
>     width: 10px;
>     height: 80px;
> }
>-
>-audio::-webkit-media-controls-volume-slider-mute-button, video::-webkit-media-controls-volume-slider-mute-button {
>-    -webkit-appearance: media-volume-slider-mute-button;
>-    display: inline;
>-    position: absolute;
>-
>-    bottom: 5px;
>-    left: 4px;
>-
>-    width: 14px;
>-    height: 12px;
>-    border: none !important;
>-} 
>diff --git a/Source/WebCore/html/shadow/MediaControlElements.cpp b/Source/WebCore/html/shadow/MediaControlElements.cpp
>index 0f34538808dbb7cdd549eec831219ef94c9a5058..5e4af9d670290790cf203e647c408b0b4024e637 100644
>--- a/Source/WebCore/html/shadow/MediaControlElements.cpp
>+++ b/Source/WebCore/html/shadow/MediaControlElements.cpp
>@@ -320,34 +320,6 @@ const AtomicString& MediaControlTimelineContainerElement::shadowPseudoId() const
> 
> // ----------------------------
> 
>-class RenderMediaVolumeSliderContainer : public RenderBlock {
>-public:
>-    RenderMediaVolumeSliderContainer(Node*);
>-
>-private:
>-    virtual void layout();
>-};
>-
>-RenderMediaVolumeSliderContainer::RenderMediaVolumeSliderContainer(Node* node)
>-    : RenderBlock(node)
>-{
>-}
>-
>-void RenderMediaVolumeSliderContainer::layout()
>-{
>-    RenderBlock::layout();
>-    if (style()->display() == NONE || !previousSibling() || !previousSibling()->isBox())
>-        return;
>-
>-    RenderBox* buttonBox = toRenderBox(previousSibling());
>-
>-    LayoutStateDisabler layoutStateDisabler(view());
>-
>-    LayoutPoint offset = theme()->volumeSliderOffsetFromMuteButton(buttonBox, size());
>-    setX(offset.x() + buttonBox->offsetLeft());
>-    setY(offset.y() + buttonBox->offsetTop());
>-}
>-
> inline MediaControlVolumeSliderContainerElement::MediaControlVolumeSliderContainerElement(Document* document)
>     : MediaControlElement(document)
> {
>@@ -360,11 +332,6 @@ PassRefPtr<MediaControlVolumeSliderContainerElement> MediaControlVolumeSliderCon
>     return element.release();
> }
> 
>-RenderObject* MediaControlVolumeSliderContainerElement::createRenderer(RenderArena* arena, RenderStyle*)
>-{
>-    return new (arena) RenderMediaVolumeSliderContainer(this);
>-}
>-
> void MediaControlVolumeSliderContainerElement::defaultEventHandler(Event* event)
> {
>     if (!event->isMouseEvent() || event->type() != eventNames().mouseoutEvent)
>diff --git a/Source/WebCore/html/shadow/MediaControlElements.h b/Source/WebCore/html/shadow/MediaControlElements.h
>index efa69a58c5a6e2afc66bb15a23b338571eaee497..2c7dfd810cc7cd9ee08202e91e921157035eec0b 100644
>--- a/Source/WebCore/html/shadow/MediaControlElements.h
>+++ b/Source/WebCore/html/shadow/MediaControlElements.h
>@@ -159,7 +159,6 @@ public:
> 
> private:
>     MediaControlVolumeSliderContainerElement(Document*);
>-    virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
>     virtual void defaultEventHandler(Event*);
>     virtual MediaControlElementType displayType() const;
>     virtual const AtomicString& shadowPseudoId() const;
>diff --git a/Source/WebCore/html/shadow/MediaControlRootElement.cpp b/Source/WebCore/html/shadow/MediaControlRootElement.cpp
>index 4505fde80e94ab23af38a9118bd17f3c97621d34..f516fddcf5013779c11084aa832a04bce37467fe 100644
>--- a/Source/WebCore/html/shadow/MediaControlRootElement.cpp
>+++ b/Source/WebCore/html/shadow/MediaControlRootElement.cpp
>@@ -173,11 +173,8 @@ PassRefPtr<MediaControlRootElement> MediaControlRootElement::create(Document* do
>     controls->m_fullScreenButton = fullScreenButton.get();
>     panel->appendChild(fullScreenButton.release(), ec, true);
> 
>-    RefPtr<MediaControlPanelMuteButtonElement> panelMuteButton = MediaControlPanelMuteButtonElement::create(document, controls.get());
>-    controls->m_panelMuteButton = panelMuteButton.get();
>-    panel->appendChild(panelMuteButton.release(), ec, true);
>-    if (ec)
>-        return 0;
>+    // The mute button and the slider element should be in the same div.
>+    RefPtr<HTMLDivElement> panelVolumeControlContainer = HTMLDivElement::create(document);
> 
>     if (document->page()->theme()->usesMediaControlVolumeSlider()) {
>         RefPtr<MediaControlVolumeSliderContainerElement> volumeSliderContainer = MediaControlVolumeSliderContainerElement::create(document);
>@@ -188,18 +185,22 @@ PassRefPtr<MediaControlRootElement> MediaControlRootElement::create(Document* do
>         if (ec)
>             return 0;
> 
>-        RefPtr<MediaControlVolumeSliderMuteButtonElement> volumeSliderMuteButton = MediaControlVolumeSliderMuteButtonElement::create(document);
>-        controls->m_volumeSliderMuteButton = volumeSliderMuteButton.get();
>-        volumeSliderContainer->appendChild(volumeSliderMuteButton.release(), ec, true);
>-        if (ec)
>-            return 0;
>-
>         controls->m_volumeSliderContainer = volumeSliderContainer.get();
>-        panel->appendChild(volumeSliderContainer.release(), ec, true);
>+        panelVolumeControlContainer->appendChild(volumeSliderContainer.release(), ec, true);
>         if (ec)
>             return 0;
>     }
> 
>+    RefPtr<MediaControlPanelMuteButtonElement> panelMuteButton = MediaControlPanelMuteButtonElement::create(document, controls.get());
>+    controls->m_panelMuteButton = panelMuteButton.get();
>+    panelVolumeControlContainer->appendChild(panelMuteButton.release(), ec, true);
>+    if (ec)
>+        return 0;
>+
>+    panel->appendChild(panelVolumeControlContainer, ec, true);
>+    if (ec)
>+        return 0;
>+
>     // FIXME: Only create when needed <http://webkit.org/b/57163>
>     RefPtr<MediaControlFullscreenVolumeMinButtonElement> fullScreenMinVolumeButton = MediaControlFullscreenVolumeMinButtonElement::create(document);
>     controls->m_fullScreenMinVolumeButton = fullScreenMinVolumeButton.get();
>diff --git a/Source/WebCore/html/shadow/MediaControlRootElementChromium.cpp b/Source/WebCore/html/shadow/MediaControlRootElementChromium.cpp
>index bed2abb8513de3f32977c3baffdc68f8e690ae8d..dc498b86d80f54ecbc770dc0f9239591f9df1213 100644
>--- a/Source/WebCore/html/shadow/MediaControlRootElementChromium.cpp
>+++ b/Source/WebCore/html/shadow/MediaControlRootElementChromium.cpp
>@@ -106,11 +106,7 @@ PassRefPtr<MediaControlRootElementChromium> MediaControlRootElementChromium::cre
>     if (ec)
>         return 0;
> 
>-    RefPtr<MediaControlPanelMuteButtonElement> panelMuteButton = MediaControlPanelMuteButtonElement::create(document, controls.get());
>-    controls->m_panelMuteButton = panelMuteButton.get();
>-    panel->appendChild(panelMuteButton.release(), ec, true);
>-    if (ec)
>-        return 0;
>+    RefPtr<HTMLDivElement> panelVolumeControlContainer = HTMLDivElement::create(document);
> 
>     RefPtr<MediaControlVolumeSliderContainerElement> volumeSliderContainer = MediaControlVolumeSliderContainerElement::create(document);
> 
>@@ -121,7 +117,17 @@ PassRefPtr<MediaControlRootElementChromium> MediaControlRootElementChromium::cre
>         return 0;
> 
>     controls->m_volumeSliderContainer = volumeSliderContainer.get();
>-    panel->appendChild(volumeSliderContainer.release(), ec, true);
>+    panelVolumeControlContainer->appendChild(volumeSliderContainer.release(), ec, true);
>+    if (ec)
>+        return 0;
>+
>+    RefPtr<MediaControlPanelMuteButtonElement> panelMuteButton = MediaControlPanelMuteButtonElement::create(document, controls.get());
>+    controls->m_panelMuteButton = panelMuteButton.get();
>+    panelVolumeControlContainer->appendChild(panelMuteButton.release(), ec, true);
>+    if (ec)
>+        return 0;
>+
>+    panel->appendChild(panelVolumeControlContainer, ec, true);
>     if (ec)
>         return 0;
> 
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 5db351793af8ce4c830892b7d612278bbe24c554..a12d3b72977b5d270a3fc382d38dccb842172e61 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,27 @@
>+2012-04-10  Victor Carbune  <vcarbune@adobe.com>
>+
>+        Simplify volume slider rendering
>+        https://bugs.webkit.org/show_bug.cgi?id=82150
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Added new TEXT baselines for Mac.
>+        Baselines for Chromium need to be generated as well.
>+
>+        * media/video-controls-rendering-toggle-display-none-expected.txt: Added.
>+        * media/video-controls-rendering-toggle-display-none.html: Added.
>+        * platform/chromium/test_expectations.txt: Test expectations.
>+        * platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt: Updated.
>+        * platform/mac/media/audio-controls-rendering-expected.txt: Updated.
>+        * platform/mac/media/audio-repaint-expected.txt: Updated.
>+        * platform/mac/media/controls-after-reload-expected.txt: Updated.
>+        * platform/mac/media/controls-strict-expected.txt: Updated.
>+        * platform/mac/media/media-controls-clone-expected.txt: Updated.
>+        * platform/mac/media/video-controls-rendering-expected.txt: Updated.
>+        * platform/mac/media/video-display-toggle-expected.txt: Updated.
>+        * platform/mac/media/video-no-audio-expected.txt: Updated
>+        * platform/mac/media/video-playing-and-pause-expected.txt: Updated.
>+
> 2012-04-10  Rob Buis  <rbuis@rim.com>
> 
>         getElementsByTagName unable to find SVG camelCase elements imported into HTML
>diff --git a/LayoutTests/media/video-controls-rendering-toggle-display-none-expected.txt b/LayoutTests/media/video-controls-rendering-toggle-display-none-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..39c9b31a604d3fe0dc0b2c82ed4fc9e241ba374f
>--- /dev/null
>+++ b/LayoutTests/media/video-controls-rendering-toggle-display-none-expected.txt
>@@ -0,0 +1,9 @@
>+Tests that the video controls are properly rendered when the display none is set and unset.
>+
>+** The volume slider should have almost the same left offset as the mute button **
>+EXPECTED (volumeSliderElement.offsetLeft >= muteButtonElement.offsetLeft - threshold == 'true') OK
>+EXPECTED (volumeSliderElement.offsetLeft <= muteButtonElement.offsetLeft + threshold == 'true') OK
>+
>+** The volume slider should be on top of the mute button **
>+EXPECTED (volumeSliderElement.offsetTop < muteButtonElement.offsetTop == 'true') OK
>+
>diff --git a/LayoutTests/media/video-controls-rendering-toggle-display-none.html b/LayoutTests/media/video-controls-rendering-toggle-display-none.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..aacf67fc679c352af805681aadddd2c1179cb5b0
>--- /dev/null
>+++ b/LayoutTests/media/video-controls-rendering-toggle-display-none.html
>@@ -0,0 +1,70 @@
>+<html>
>+<head>
>+    <title>Test rendering of volume slider of video tag</title>
>+    <script src=media-file.js></script>
>+    <script src=media-controls.js></script>
>+    <script src=video-test.js></script>
>+    <script>
>+        var video;
>+        var panel;
>+        var threshold = 2;
>+
>+        var muteButtonCoordinates;
>+        var volumeSliderCoordinates;
>+
>+        var volumeSliderElement;
>+        var muteButtonElement;
>+
>+        function init()
>+        {
>+            video = document.getElementsByTagName("video")[0];
>+            video.src = findMediaFile("video", "content/test");
>+        }
>+
>+        function test()
>+        {
>+            if (window.eventSender) {
>+                try {
>+                    muteButtonCoordinates = mediaControlsButtonCoordinates(video, "mute-button");
>+                    volumeSliderCoordinates = mediaControlsButtonCoordinates(video, "volume-slider-container");
>+                } catch (exception) {
>+                    layoutTestController.notifyDone();
>+                    return;
>+                }
>+
>+                eventSender.mouseMoveTo(muteButtonCoordinates[0], muteButtonCoordinates[1]);
>+            }
>+
>+            panel = mediaControlsElement(internals.shadowRoot(video).firstChild, "-webkit-media-controls-panel");
>+            volumeSliderElement = mediaControlsElement(internals.shadowRoot(video).firstChild, "-webkit-media-controls-volume-slider-container");
>+            muteButtonElement = mediaControlsElement(internals.shadowRoot(video).firstChild, "-webkit-media-controls-mute-button");
>+
>+
>+            // Ensure paint with display property set to "none".
>+            panel.style.display = "none";
>+            document.body.offsetTop;
>+
>+            // Ensure (re)paint with default display property.
>+            panel.style.removeProperty("display");
>+            document.body.offsetTop;
>+
>+            // Test that the left offset of both controls is equal.
>+            consoleWrite("");
>+            consoleWrite("** The volume slider should have almost the same left offset as the mute button **");
>+            testExpected("volumeSliderElement.offsetLeft >= muteButtonElement.offsetLeft - threshold", true);
>+            testExpected("volumeSliderElement.offsetLeft <= muteButtonElement.offsetLeft + threshold", true);
>+
>+            consoleWrite("");
>+            consoleWrite("** The volume slider should be on top of the mute button **");
>+            testExpected("volumeSliderElement.offsetTop < muteButtonElement.offsetTop", true);
>+
>+            layoutTestController.notifyDone();
>+        }
>+    </script>
>+</head>
>+<body onload="init()">
>+    Tests that the video controls are properly rendered when the display none is set and unset.<br>
>+
>+    <video oncanplaythrough="test()" controls preload="true"></video>
>+</body>
>+</html>
>diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
>index b23b879e062f3d179599bba68aec661b3faaf336..c72d1183ba8a40305c2eb88ca86092213b97ed3b 100644
>--- a/LayoutTests/platform/chromium/test_expectations.txt
>+++ b/LayoutTests/platform/chromium/test_expectations.txt
>@@ -3554,6 +3554,24 @@ BUGWK81931 SNOWLEOPARD DEBUG : fast/images/destroyed-image-load-event.html = PAS
> BUGWK37244 : tables/mozilla/bugs/bug27038-1.html = IMAGE+TEXT
> BUGWK37244 : tables/mozilla/bugs/bug27038-2.html = IMAGE+TEXT
> 
>+// Need rebaselining.
>+BUGWK82150 : media/media-document-audio-repaint.html = TEXT
>+BUGWK82150 : media/video-no-audio.html = TEXT
>+BUGWK82150 : media/controls-strict.html = TEXT
>+BUGWK82150 : media/video-volume-slider.html = TEXT
>+BUGWK82150 : media/controls-styling.html = TEXT
>+BUGWK82150 : media/video-display-toggle.html = TEXT
>+BUGWK82150 : media/audio-repaint.html = TEXT
>+BUGWK82150 : media/audio-controls-rendering.html = TEXT
>+BUGWK82150 : media/video-zoom-controls.html = TEXT
>+BUGWK82150 : media/video-controls-rendering.html = TEXT
>+BUGWK82150 : media/controls-without-preload.html = TEXT
>+BUGWK82150 : media/media-controls-clone.html = TEXT
>+BUGWK82150 : fast/layers/video-layer.html = TEXT
>+BUGWK82150 : media/video-empty-source.html = TEXT
>+BUGWK82150 : media/video-playing-and-pause.html = TEXT
>+BUGWK82150 : media/controls-after-reload.html = TEXT
>+
> // New test, flaky since added in r110965.
> BUGWK82097 : editing/selection/move-by-word-visually-crash-test-5.html = PASS TIMEOUT
> 
>diff --git a/LayoutTests/platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt b/LayoutTests/platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt
>index 53a63c29c1f3fb5c43196875566000cb55eedb65..d91b5c85ae6cd5808626ed2247ea5bf451554418 100644
>--- a/LayoutTests/platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt
>+++ b/LayoutTests/platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt
>@@ -16,3 +16,4 @@ layer at (8,151) size 300x25
>   RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,125) size 300x25
>     RenderButton {INPUT} at (6,3) size 18x18
>     RenderButton {INPUT} at (32,4) size 16x16
>+    RenderBlock {DIV} at (49,12) size 0x0
>diff --git a/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt b/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt
>index 507984e350fc0f52cbdd1fbb0ff4bd36c4851440..7e7ac0b796996c710d4ed96564e51b63fbeef3e1 100644
>--- a/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt
>+++ b/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt
>@@ -33,9 +33,11 @@ layer at (8,42) size 200x25
>         RenderBlock (anonymous) at (7,0) size 31x11
>           RenderText {#text} at (0,0) size 31x11
>             text run at (0,0) width 31: "-00:07"
>-    RenderButton {INPUT} at (177,6) size 14x12
>+    RenderBlock {DIV} at (175,6) size 25x12
> layer at (57,51) size 10x8
>   RenderBlock (relative positioned) {DIV} at (0,0) size 10x8
>+layer at (185,48) size 14x12
>+  RenderButton zI: 2 {INPUT} at (2,0) size 14x12
> layer at (8,85) size 320x25
>   RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x25
> layer at (8,85) size 320x25
>@@ -55,9 +57,11 @@ layer at (8,85) size 320x25
>         RenderBlock (anonymous) at (7,0) size 31x11
>           RenderText {#text} at (0,0) size 31x11
>             text run at (0,0) width 31: "-00:07"
>-    RenderButton {INPUT} at (297,6) size 14x12
>+    RenderBlock {DIV} at (295,6) size 25x12
> layer at (102,94) size 10x8
>   RenderBlock (relative positioned) {DIV} at (0,0) size 10x8
>+layer at (305,91) size 14x12
>+  RenderButton zI: 2 {INPUT} at (2,0) size 14x12
> layer at (8,128) size 320x100
>   RenderMedia {AUDIO} at (8,128) size 320x100 [bgcolor=#0000FF]
> layer at (8,128) size 320x100
>@@ -79,6 +83,8 @@ layer at (8,203) size 320x25
>         RenderBlock (anonymous) at (7,0) size 31x11
>           RenderText {#text} at (0,0) size 31x11
>             text run at (0,0) width 31: "-00:07"
>-    RenderButton {INPUT} at (297,6) size 14x12
>+    RenderBlock {DIV} at (295,6) size 25x12
> layer at (102,212) size 10x8
>   RenderBlock (relative positioned) {DIV} at (0,0) size 10x8
>+layer at (305,209) size 14x12
>+  RenderButton zI: 2 {INPUT} at (2,0) size 14x12
>diff --git a/LayoutTests/platform/mac/media/audio-repaint-expected.txt b/LayoutTests/platform/mac/media/audio-repaint-expected.txt
>index 67600a3ca7e7514b87d09937f7c03d01f14a0e5c..69de5ca0195a5a9ea658c9ffc15a99ed2d148e6a 100644
>--- a/LayoutTests/platform/mac/media/audio-repaint-expected.txt
>+++ b/LayoutTests/platform/mac/media/audio-repaint-expected.txt
>@@ -33,9 +33,11 @@ layer at (8,67) size 200x25
>         RenderBlock (anonymous) at (7,0) size 31x11
>           RenderText {#text} at (0,0) size 31x11
>             text run at (0,0) width 31: "-00:00"
>-    RenderButton {INPUT} at (177,6) size 14x12
>+    RenderBlock {DIV} at (175,6) size 25x12
> layer at (114,76) size 10x8
>   RenderBlock (relative positioned) {DIV} at (0,0) size 10x8
>+layer at (185,73) size 14x12
>+  RenderButton zI: 2 {INPUT} at (2,0) size 14x12
> layer at (8,42) size 200x25
>   RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 200x25
> layer at (8,42) size 200x25
>@@ -55,9 +57,11 @@ layer at (8,42) size 200x25
>         RenderBlock (anonymous) at (7,0) size 31x11
>           RenderText {#text} at (0,0) size 31x11
>             text run at (0,0) width 31: "-00:00"
>-    RenderButton {INPUT} at (177,6) size 14x12
>+    RenderBlock {DIV} at (175,6) size 25x12
> layer at (114,51) size 10x8
>   RenderBlock (relative positioned) {DIV} at (0,0) size 10x8
>+layer at (185,48) size 14x12
>+  RenderButton zI: 2 {INPUT} at (2,0) size 14x12
> layer at (8,144) size 200x25
>   RenderMedia {AUDIO} at (0,102) size 200x25
> layer at (8,144) size 200x25
>@@ -79,6 +83,8 @@ layer at (8,144) size 200x25
>         RenderBlock (anonymous) at (7,0) size 31x11
>           RenderText {#text} at (0,0) size 31x11
>             text run at (0,0) width 31: "-00:00"
>-    RenderButton {INPUT} at (177,6) size 14x12
>+    RenderBlock {DIV} at (175,6) size 25x12
> layer at (114,153) size 10x8
>   RenderBlock (relative positioned) {DIV} at (0,0) size 10x8
>+layer at (185,150) size 14x12
>+  RenderButton zI: 2 {INPUT} at (2,0) size 14x12
>diff --git a/LayoutTests/platform/mac/media/controls-after-reload-expected.txt b/LayoutTests/platform/mac/media/controls-after-reload-expected.txt
>index 0c9e0dcf88eb647c4725dcd47a45bf72af6cbdf7..223c3a72aebf64a128259f6e755350068edbc946 100644
>--- a/LayoutTests/platform/mac/media/controls-after-reload-expected.txt
>+++ b/LayoutTests/platform/mac/media/controls-after-reload-expected.txt
>@@ -30,6 +30,8 @@ layer at (8,257) size 320x25
>           RenderText {#text} at (0,0) size 31x11
>             text run at (0,0) width 31: "-00:06"
>     RenderButton {INPUT} at (297,3) size 16x18
>-    RenderButton {INPUT} at (267,6) size 14x12
>+    RenderBlock {DIV} at (265,6) size 25x12
> layer at (102,266) size 10x8
>   RenderBlock (relative positioned) {DIV} at (0,0) size 10x8
>+layer at (275,263) size 14x12
>+  RenderButton zI: 2 {INPUT} at (2,0) size 14x12
>diff --git a/LayoutTests/platform/mac/media/controls-strict-expected.txt b/LayoutTests/platform/mac/media/controls-strict-expected.txt
>index 970dd1ed76dad6475eaacc0a63afafdbda58aff0..af98410da7e1b1f953cf65f6b5c43e169b195538 100644
>--- a/LayoutTests/platform/mac/media/controls-strict-expected.txt
>+++ b/LayoutTests/platform/mac/media/controls-strict-expected.txt
>@@ -30,6 +30,8 @@ layer at (8,265) size 320x25
>           RenderText {#text} at (0,0) size 31x11
>             text run at (0,0) width 31: "-00:06"
>     RenderButton {INPUT} at (297,3) size 16x18
>-    RenderButton {INPUT} at (267,6) size 14x12
>+    RenderBlock {DIV} at (265,6) size 25x12
> layer at (102,274) size 10x8
>   RenderBlock (relative positioned) {DIV} at (0,0) size 10x8
>+layer at (275,271) size 14x12
>+  RenderButton zI: 2 {INPUT} at (2,0) size 14x12
>diff --git a/LayoutTests/platform/mac/media/media-controls-clone-expected.txt b/LayoutTests/platform/mac/media/media-controls-clone-expected.txt
>index a4b7a13d16c56353df8b8c96efe8678d8373575b..4b37b286e9c9c7037d2dd40033175b193ca3e27f 100644
>--- a/LayoutTests/platform/mac/media/media-controls-clone-expected.txt
>+++ b/LayoutTests/platform/mac/media/media-controls-clone-expected.txt
>@@ -17,21 +17,25 @@ layer at (8,133) size 300x25
>   RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,125) size 300x25
>     RenderButton {INPUT} at (6,3) size 18x18
>     RenderButton {INPUT} at (32,4) size 16x16
>+    RenderBlock {DIV} at (49,12) size 0x0
> layer at (308,133) size 200x25
>   RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 200x25
> layer at (308,133) size 200x25
>   RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 200x25
>     RenderButton {INPUT} at (6,3) size 18x18
>     RenderButton {INPUT} at (32,4) size 16x16
>+    RenderBlock {DIV} at (49,12) size 0x0
> layer at (8,162) size 300x150
>   RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x150
> layer at (8,287) size 300x25
>   RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,125) size 300x25
>     RenderButton {INPUT} at (6,3) size 18x18
>     RenderButton {INPUT} at (32,4) size 16x16
>+    RenderBlock {DIV} at (49,12) size 0x0
> layer at (308,287) size 200x25
>   RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 200x25
> layer at (308,287) size 200x25
>   RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 200x25
>     RenderButton {INPUT} at (6,3) size 18x18
>     RenderButton {INPUT} at (32,4) size 16x16
>+    RenderBlock {DIV} at (49,12) size 0x0
>diff --git a/LayoutTests/platform/mac/media/video-controls-rendering-expected.txt b/LayoutTests/platform/mac/media/video-controls-rendering-expected.txt
>index 25a64df5fe106a5932561b5d2e977c473941dccd..0527d8537de35a364a64fb8f71ec6d73e18fc199 100644
>--- a/LayoutTests/platform/mac/media/video-controls-rendering-expected.txt
>+++ b/LayoutTests/platform/mac/media/video-controls-rendering-expected.txt
>@@ -35,9 +35,11 @@ layer at (8,257) size 320x25
>           RenderText {#text} at (0,0) size 31x11
>             text run at (0,0) width 31: "-00:06"
>     RenderButton {INPUT} at (297,3) size 16x18
>-    RenderButton {INPUT} at (267,6) size 14x12
>+    RenderBlock {DIV} at (265,6) size 25x12
> layer at (102,266) size 10x8
>   RenderBlock (relative positioned) {DIV} at (0,0) size 10x8
>+layer at (275,263) size 14x12
>+  RenderButton zI: 2 {INPUT} at (2,0) size 14x12
> layer at (8,282) size 320x240
>   RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 320x240
> layer at (8,497) size 320x25
>@@ -58,9 +60,11 @@ layer at (8,497) size 320x25
>           RenderText {#text} at (0,0) size 31x11
>             text run at (0,0) width 31: "-00:06"
>     RenderButton {INPUT} at (297,3) size 16x18
>-    RenderButton {INPUT} at (267,6) size 14x12
>+    RenderBlock {DIV} at (265,6) size 25x12
> layer at (102,506) size 10x8
>   RenderBlock (relative positioned) {DIV} at (0,0) size 10x8
>+layer at (275,503) size 14x12
>+  RenderButton zI: 2 {INPUT} at (2,0) size 14x12
> layer at (8,522) size 320x240
>   RenderVideo {VIDEO} at (8,522) size 320x240
> layer at (8,522) size 320x240
>@@ -83,6 +87,8 @@ layer at (8,737) size 320x25
>           RenderText {#text} at (0,0) size 31x11
>             text run at (0,0) width 31: "-00:06"
>     RenderButton {INPUT} at (297,3) size 16x18
>-    RenderButton {INPUT} at (267,6) size 14x12
>+    RenderBlock {DIV} at (265,6) size 25x12
> layer at (102,746) size 10x8
>   RenderBlock (relative positioned) {DIV} at (0,0) size 10x8
>+layer at (275,743) size 14x12
>+  RenderButton zI: 2 {INPUT} at (2,0) size 14x12
>diff --git a/LayoutTests/platform/mac/media/video-display-toggle-expected.txt b/LayoutTests/platform/mac/media/video-display-toggle-expected.txt
>index 7e91834ff501d399f7a7f4b0e2b31bac6abf9932..6ada0686ce792020715c1af952d82c99059caf1b 100644
>--- a/LayoutTests/platform/mac/media/video-display-toggle-expected.txt
>+++ b/LayoutTests/platform/mac/media/video-display-toggle-expected.txt
>@@ -29,6 +29,8 @@ layer at (8,241) size 320x25
>           RenderText {#text} at (0,0) size 31x11
>             text run at (0,0) width 31: "-00:06"
>     RenderButton {INPUT} at (297,3) size 16x18
>-    RenderButton {INPUT} at (267,6) size 14x12
>+    RenderBlock {DIV} at (265,6) size 25x12
> layer at (102,250) size 10x8
>   RenderBlock (relative positioned) {DIV} at (0,0) size 10x8
>+layer at (275,247) size 14x12
>+  RenderButton zI: 2 {INPUT} at (2,0) size 14x12
>diff --git a/LayoutTests/platform/mac/media/video-no-audio-expected.txt b/LayoutTests/platform/mac/media/video-no-audio-expected.txt
>index bed507eaee2f9ac99aac755b31dd843de74814af..9e746dc4af5511f7e9c52c9dfdf223b6cb631430 100644
>--- a/LayoutTests/platform/mac/media/video-no-audio-expected.txt
>+++ b/LayoutTests/platform/mac/media/video-no-audio-expected.txt
>@@ -30,5 +30,6 @@ layer at (8,305) size 352x25
>           RenderText {#text} at (0,0) size 31x11
>             text run at (0,0) width 31: "-00:09"
>     RenderButton {INPUT} at (329,3) size 16x18
>+    RenderBlock {DIV} at (322,12) size 0x0
> layer at (102,314) size 10x8
>   RenderBlock (relative positioned) {DIV} at (0,0) size 10x8
>diff --git a/LayoutTests/platform/mac/media/video-playing-and-pause-expected.txt b/LayoutTests/platform/mac/media/video-playing-and-pause-expected.txt
>index 0b8de3559a1862b1fd73b4a2ba24f5b66b077c56..f636bf2142f0917dd7aea87d94a587bb6f4e29ed 100644
>--- a/LayoutTests/platform/mac/media/video-playing-and-pause-expected.txt
>+++ b/LayoutTests/platform/mac/media/video-playing-and-pause-expected.txt
>@@ -31,6 +31,8 @@ layer at (8,283) size 320x25
>           RenderText {#text} at (0,0) size 31x11
>             text run at (0,0) width 31: "-00:06"
>     RenderButton {INPUT} at (297,3) size 16x18
>-    RenderButton {INPUT} at (267,6) size 14x12
>+    RenderBlock {DIV} at (265,6) size 25x12
> layer at (102,292) size 10x8
>   RenderBlock (relative positioned) {DIV} at (0,0) size 10x8
>+layer at (275,289) size 14x12
>+  RenderButton zI: 2 {INPUT} at (2,0) size 14x12

Actions: View | Formatted Diff | Diff

Attachments on bug 82150: 133700 | 133702 | 134039 | 134048 | 134315 | 134328 | 135820 | 136015 | 136449 | 138011 | 138121 | 138337