Attachment 141230 Details for Bug 85990 – Patch for landing

[patch] Patch for landing

bug-85990-20120510224834.patch (text/plain), 21.22 KB, created by Victor Carbune on 2012-05-10 12:48:36 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Victor Carbune

Created: 2012-05-10 12:48:36 PDT

Size: 21.22 KB

patch

obsolete

>Subversion Revision: 116673
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 7660498ac6ab95b01edc42f6de0f2e820cd630da..174e391b37707240cb721eb89cbcd2b849ea70c4 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,40 @@
>+2012-05-10  Victor Carbune  <vcarbune@adobe.com>
>+
>+        Volume slider needs to be displayed below the mute button
>+        https://bugs.webkit.org/show_bug.cgi?id=85990
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Added back code for rendering offset, but used only when the volume slider
>+        needs to be displayed below the controls.
>+
>+        Test: media/media-volume-slider-rendered-below.html
>+
>+        * css/mediaControlsChromium.css:
>+        (audio::-webkit-media-controls-volume-slider-container, video::-webkit-media-controls-volume-slider-container):
>+        Changed positioning of the slider to absolute, otherwise it is not possible to position it from the layout() method.
>+        * css/mediaControlsQuickTime.css:
>+        Added back the double mute-button and changed the z-index of the original button. When the slider is displayed
>+        the second mute button is actually there.
>+        (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):
>+        (audio::-webkit-media-controls-volume-slider-mute-button, video::-webkit-media-controls-volume-slider-mute-button):
>+        Added copy.
>+        * html/shadow/MediaControlElements.cpp:
>+        (WebCore::MediaControlPanelElement::makeTransparent): Disabled the possible of hiding controls. WebVTT rendering
>+        in the place of controls when these are visible is not possible with the current code.
>+        (RenderMediaVolumeSliderContainer):
>+        (WebCore):
>+        (WebCore::RenderMediaVolumeSliderContainer::RenderMediaVolumeSliderContainer):
>+        (WebCore::RenderMediaVolumeSliderContainer::layout):
>+        Checked if the absolute coordinates of the corner of the slider would be rendered outside the page. This part of the
>+        code is faulty if display:none is toggled on the controls.
>+        (WebCore::MediaControlVolumeSliderContainerElement::createRenderer):
>+        * html/shadow/MediaControlElements.h:
>+        (MediaControlVolumeSliderContainerElement):
>+        * html/shadow/MediaControlRootElement.cpp:
>+        (WebCore::MediaControlRootElement::create):
>+
> 2012-05-10  Pavel Feldman  <pfeldman@chromium.org>
> 
>         Web Inspector: search title is shown beside the search field (not under) in the vertical mode.
>diff --git a/Source/WebCore/css/mediaControlsChromium.css b/Source/WebCore/css/mediaControlsChromium.css
>index 7323f2a46a232cbe554dc3c60fe45aef029656a7..409398c5d0ccf0c9d63f60e9b69372e9a3924d26 100644
>--- a/Source/WebCore/css/mediaControlsChromium.css
>+++ b/Source/WebCore/css/mediaControlsChromium.css
>@@ -154,7 +154,8 @@ 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: relative;
>+    position: absolute;
>+    bottom: 32px;
> 
>     width: 34px;
>     height: 100px;
>diff --git a/Source/WebCore/css/mediaControlsQuickTime.css b/Source/WebCore/css/mediaControlsQuickTime.css
>index a7e5f41bcf2500a2fa539eb8302068be8c4196bc..2eb908b009d6bcc6d1975cc9de36a4e1b9735e02 100644
>--- a/Source/WebCore/css/mediaControlsQuickTime.css
>+++ b/Source/WebCore/css/mediaControlsQuickTime.css
>@@ -50,7 +50,7 @@ audio::-webkit-media-controls-mute-button, video::-webkit-media-controls-mute-bu
>     border: none !important;
> 
>     position: relative;
>-    z-index: 2;
>+    z-index: 1;
> }
> 
> audio::-webkit-media-controls-play-button, video::-webkit-media-controls-play-button {
>@@ -204,7 +204,7 @@ audio::-webkit-media-controls-volume-slider-container, video::-webkit-media-cont
>     position: absolute;
> 
>     bottom: 0px;
>-    z-index: 1;
>+    z-index: 2;
> 
>     width: 22px;
>     height: 114px;
>@@ -221,3 +221,21 @@ 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: 7px;
>+    left: 0px;
>+
>+    width: 14px;
>+    height: 12px;
>+
>+    margin-left: 2px;
>+    margin-right: 9px;
>+
>+    border: none !important;
>+}
>diff --git a/Source/WebCore/html/shadow/MediaControlElements.cpp b/Source/WebCore/html/shadow/MediaControlElements.cpp
>index 6ea485d1e8efdbefe595bca5c57469a14fea0e50..a82c8fb0bbbf35762f01d6af73a0ebba7b6d7400 100644
>--- a/Source/WebCore/html/shadow/MediaControlElements.cpp
>+++ b/Source/WebCore/html/shadow/MediaControlElements.cpp
>@@ -256,8 +256,6 @@ void MediaControlPanelElement::makeTransparent()
>     setInlineStyleProperty(CSSPropertyOpacity, 0.0, CSSPrimitiveValue::CSS_NUMBER);
> 
>     m_opaque = false;
>-
>-    startTimer();
> }
> 
> void MediaControlPanelElement::defaultEventHandler(Event* event)
>@@ -322,6 +320,36 @@ 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 || !nextSibling() || !nextSibling()->isBox())
>+        return;
>+
>+    RenderBox* buttonBox = toRenderBox(nextSibling());
>+    int absoluteOffsetTop = buttonBox->localToAbsolute(FloatPoint(0, -size().height())).y();
>+
>+    LayoutStateDisabler layoutStateDisabler(view());
>+
>+    // If the slider would be rendered outside the page, it should be moved below the controls.
>+    if (UNLIKELY(absoluteOffsetTop < 0))
>+        setY(buttonBox->offsetTop() + theme()->volumeSliderOffsetFromMuteButton(buttonBox, pixelSnappedSize()).y());
>+}
>+
> inline MediaControlVolumeSliderContainerElement::MediaControlVolumeSliderContainerElement(Document* document)
>     : MediaControlElement(document)
> {
>@@ -334,6 +362,11 @@ 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 467e31d781529314737aa1fce9f0f6ae69c28c62..03570f755153cc6f33adede8c94328eff66bdd79 100644
>--- a/Source/WebCore/html/shadow/MediaControlElements.h
>+++ b/Source/WebCore/html/shadow/MediaControlElements.h
>@@ -161,6 +161,7 @@ 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 7f831bc42b00a7f992f9b3e9fe053cedfac44b83..e5c8bc2c2a17b40418b47329cd9fc9e2d65c5756 100644
>--- a/Source/WebCore/html/shadow/MediaControlRootElement.cpp
>+++ b/Source/WebCore/html/shadow/MediaControlRootElement.cpp
>@@ -186,6 +186,15 @@ PassRefPtr<MediaControlRootElement> MediaControlRootElement::create(Document* do
>         if (ec)
>             return 0;
> 
>+        // This is a duplicate mute button, which is visible in some ports at the bottom of the volume bar.
>+        // It's important only when the volume bar is displayed below the controls.
>+        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();
>         panelVolumeControlContainer->appendChild(volumeSliderContainer.release(), ec, true);
>         if (ec)
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 5a687b8e46f9d4b07f11b3537dd940307ab36479..9e46b6f06960fda4f6a3b7de3095da2cea9a30d0 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,24 @@
>+2012-05-10  Victor Carbune  <vcarbune@adobe.com>
>+
>+        Volume slider needs to be displayed below the mute button
>+        https://bugs.webkit.org/show_bug.cgi?id=85990
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Updated tests expectation and marked failing tests accordingly.
>+
>+        * media/media-volume-slider-rendered-below.html: Added.
>+        * media/media-volume-slider-rendered-expected.txt: Added.
>+        * platform/chromium/test_expectations.txt: Updated.
>+        Commented two duplicate test entries, otherwise CQ complains.
>+        * platform/mac/media/audio-controls-rendering-expected.txt: Updated (z-index change).
>+        * platform/mac/media/controls-after-reload-expected.txt: Same.
>+        * platform/mac/media/controls-strict-expected.txt: Same.
>+        * platform/mac/media/video-controls-rendering-expected.txt: Same.
>+        * platform/mac/media/video-display-toggle-expected.txt: Same.
>+        * platform/mac/media/video-playing-and-pause-expected.txt: Same.
>+        * platform/mac/test_expectations.txt: Updated.
>+
> 2012-05-10  Varun Jain  <varunjain@google.com>
> 
>         [chromium] Trigger context menu for long press gesture
>diff --git a/LayoutTests/media/media-volume-slider-rendered-below-expected.txt b/LayoutTests/media/media-volume-slider-rendered-below-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..350d40c82df40252d5a197fd2f77581912779f89
>--- /dev/null
>+++ b/LayoutTests/media/media-volume-slider-rendered-below-expected.txt
>@@ -0,0 +1,10 @@
>+** Test that the volume slider is rendered correctly if the controls are near the top of the page **
>+
>+** Move mouse on top of the mute button **
>+
>+** Ensure layout is done after mouse move **
>+
>+** The volume slider should not be positioned outside the page **
>+EXPECTED (volumeSliderCoordinates[0] >= 0 && volumeSliderCoordinates[1] >= 0 == 'true') OK
>+END OF TEST
>+
>diff --git a/LayoutTests/media/media-volume-slider-rendered-below.html b/LayoutTests/media/media-volume-slider-rendered-below.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..8fb80008807005ea5673b13b114e5b4d4520f60a
>--- /dev/null
>+++ b/LayoutTests/media/media-volume-slider-rendered-below.html
>@@ -0,0 +1,60 @@
>+<!DOCTYPE html>
>+<html>
>+    <title>Test that volume slider is rendered below. </title>
>+
>+    <head>
>+
>+    <script src=video-test.js></script>
>+    <script src=media-file.js></script>
>+    <script src=media-controls.js></script>
>+
>+    <script>
>+        var audio;
>+
>+        var muteButtonCoordinates;
>+        var volumeSliderCoordinates;
>+
>+        function test()
>+        {
>+            consoleWrite("** Test that the volume slider is rendered correctly if the controls are near the top of the page **");
>+
>+            if (window.eventSender) {
>+                consoleWrite("");
>+                consoleWrite("** Move mouse on top of the mute button **");
>+
>+                try {
>+                    muteButtonCoordinates = mediaControlsButtonCoordinates(audio, "mute-button");
>+                } catch (exception) {
>+                    consoleWrite("ERROR: unable to get controls coordinates.");
>+
>+                    failTest();
>+                    return;
>+                }
>+
>+                eventSender.mouseMoveTo(muteButtonCoordinates[0], muteButtonCoordinates[1]);
>+            }
>+
>+            consoleWrite("");
>+            consoleWrite("** Ensure layout is done after mouse move **");
>+            document.body.offsetTop;
>+            volumeSliderCoordinates = mediaControlsButtonCoordinates(audio, "volume-slider-container");
>+
>+            consoleWrite("");
>+            consoleWrite("** The volume slider should not be positioned outside the page **");
>+            testExpected("volumeSliderCoordinates[0] >= 0 && volumeSliderCoordinates[1] >= 0", true);
>+
>+            endTest();
>+        }
>+
>+        function initialize()
>+        {
>+            audio = document.getElementsByTagName("audio")[0];
>+            audio.src = findMediaFile("audio", "content/test");
>+        }
>+    </script>
>+    </head>
>+
>+    <body onload="initialize();">
>+        <audio controls oncanplaythrough="test();"></audio>
>+    </body>
>+</html>
>diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
>index 40ef89e1fd1474dea7f30bb543c6f8fa49a8badd..7ff6bc5709064b5ffe7bd3e8400359166a7d53f1 100644
>--- a/LayoutTests/platform/chromium/test_expectations.txt
>+++ b/LayoutTests/platform/chromium/test_expectations.txt
>@@ -3046,6 +3046,12 @@ BUGWK73865 : media/track/text-track-is-reachable.html = TEXT CRASH
> BUGWK81402 WIN : media/track/track-active-cues.html = PASS TIMEOUT
> BUGWK83882 : media/track/track-mode.html = PASS TEXT TIMEOUT
> 
>+BUGWK85990 : media/video-controls-rendering-toggle-display-none.html = TEXT
>+BUGWK85990 : media/video-controls-toggling.html = TIMEOUT
>+
>+// Needs rebaseline.
>+BUGWK85990 : media/video-volume-slider.html = TEXT
>+
> BUGWK72271 MAC DEBUG : fast/loader/javascript-url-in-embed.html = PASS CRASH
> BUGWK72271 SNOWLEOPARD DEBUG : fast/dom/node-iterator-reference-node-moved-crash.html = PASS CRASH
> 
>@@ -3888,7 +3894,7 @@ BUGNOEL : fast/backgrounds/size/contain-and-cover-zoomed.html = IMAGE
> BUGNOEL : fast/backgrounds/size/contain-and-cover.html = IMAGE
> BUGNOEL : fast/block/float/014.html = IMAGE
> BUGNOEL : fast/css/line-height-determined-by-primary-font.html = IMAGE
>-BUGNOEL : fast/images/color-jpeg-with-color-profile.html = IMAGE
>+// BUGNOEL : fast/images/color-jpeg-with-color-profile.html = IMAGE
> BUGNOEL : fast/images/gray-scale-jpeg-with-color-profile.html = IMAGE
> BUGNOEL : fast/images/image-css3-content-data.html = IMAGE
> BUGNOEL : fast/images/rgb-jpeg-with-adobe-marker-only.html = IMAGE
>@@ -3924,7 +3930,7 @@ BUGNOEL : svg/dynamic-updates/SVGFEImageElement-svgdom-preserveAspectRatio-prop.
> BUGNOEL : svg/repaint/image-href-change.svg = IMAGE
> BUGNOEL : tables/mozilla/bugs/bug101674.html = IMAGE
> BUGNOEL : tables/mozilla/bugs/bug10565.html = IMAGE
>-BUGNOEL : tables/mozilla/bugs/bug1188.html = IMAGE
>+// BUGNOEL : tables/mozilla/bugs/bug1188.html = IMAGE
> BUGNOEL : tables/mozilla/bugs/bug11026.html = IMAGE
> BUGNOEL : tables/mozilla/bugs/bug120107.html = IMAGE
> BUGNOEL : tables/mozilla/bugs/bug1271.html = IMAGE
>diff --git a/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt b/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt
>index 7e10a4720efd06f189fa353b95c235e18bdc3d33..d1910b33780508d4da01703173ec4500802e010f 100644
>--- a/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt
>+++ b/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt
>@@ -29,7 +29,7 @@ layer at (8,42) size 200x25
> 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
>+  RenderButton zI: 1 {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,7 +55,7 @@ layer at (258,92) size 45x11
> 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
>+  RenderButton zI: 1 {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
>@@ -83,4 +83,4 @@ layer at (258,210) size 45x11
> 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
>+  RenderButton zI: 1 {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 e107f199eae4980b0172769f2443118c6e0870cb..b2c147412d4ddf0379b7ecfbed8b6800d9b82efd 100644
>--- a/LayoutTests/platform/mac/media/controls-after-reload-expected.txt
>+++ b/LayoutTests/platform/mac/media/controls-after-reload-expected.txt
>@@ -36,4 +36,4 @@ layer at (228,264) size 45x11
> 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
>+  RenderButton zI: 1 {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 42c5a42b80ff2d61bb3700acb9a8dbd224aefd52..f4247fdb8b4811d8a1b89d28e7542e10d92ae00c 100644
>--- a/LayoutTests/platform/mac/media/controls-strict-expected.txt
>+++ b/LayoutTests/platform/mac/media/controls-strict-expected.txt
>@@ -36,4 +36,4 @@ layer at (228,272) size 45x11
> 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
>+  RenderButton zI: 1 {INPUT} at (2,0) size 14x12
>diff --git a/LayoutTests/platform/mac/media/video-controls-rendering-expected.txt b/LayoutTests/platform/mac/media/video-controls-rendering-expected.txt
>index 87c16e31bda5f46e1a63bf4543372fda6bcaa239..5184aa7278d3a588934a5ce3b9f0a0cc13c654fe 100644
>--- a/LayoutTests/platform/mac/media/video-controls-rendering-expected.txt
>+++ b/LayoutTests/platform/mac/media/video-controls-rendering-expected.txt
>@@ -41,7 +41,7 @@ layer at (228,264) size 45x11
> 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
>+  RenderButton zI: 1 {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
>@@ -68,7 +68,7 @@ layer at (228,504) size 45x11
> 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
>+  RenderButton zI: 1 {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
>@@ -97,4 +97,4 @@ layer at (228,744) size 45x11
> 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
>+  RenderButton zI: 1 {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 100d60805da2fff41ed1867f33058d1fbc4450ff..99a82d41686f9d262d8dc335c259902b650d03fe 100644
>--- a/LayoutTests/platform/mac/media/video-display-toggle-expected.txt
>+++ b/LayoutTests/platform/mac/media/video-display-toggle-expected.txt
>@@ -35,4 +35,4 @@ layer at (228,248) size 45x11
> 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
>+  RenderButton zI: 1 {INPUT} at (2,0) size 14x12
>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 88bc64dc8734efed4b16f1833f5d7ebe8655a61b..49ccef4e3008be0317fe656a5a5f16882d04f49e 100644
>--- a/LayoutTests/platform/mac/media/video-playing-and-pause-expected.txt
>+++ b/LayoutTests/platform/mac/media/video-playing-and-pause-expected.txt
>@@ -37,4 +37,4 @@ layer at (228,290) size 45x11
> 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
>+  RenderButton zI: 1 {INPUT} at (2,0) size 14x12
>diff --git a/LayoutTests/platform/mac/test_expectations.txt b/LayoutTests/platform/mac/test_expectations.txt
>index 02c4514c0b9469c7401c7df6eb293772e2ec119e..98a6a71e1891fa53c900e804b54d8bba8081307f 100644
>--- a/LayoutTests/platform/mac/test_expectations.txt
>+++ b/LayoutTests/platform/mac/test_expectations.txt
>@@ -204,5 +204,8 @@ BUGWK85565 : fast/css/border-solid-single-edge-antialias.html = IMAGE
> // Interferes with the tests that should pass
> BUGWK85689 SKIP : fast/animation/request-animation-frame-disabled.html = TEXT
> 
>+BUGWK89950 : media/video-controls-rendering-toggle-display-none.html = TEXT
>+BUGWK89950 : media/video-controls-toggling.html = TIMEOUT TEXT
>+
> BUGWK85308 : ietestcenter/css3/valuesandunits/units-000.htm = IMAGE
> BUGWK85310 : ietestcenter/css3/valuesandunits/units-010.htm = IMAGE

Actions: View | Formatted Diff | Diff

Attachments on bug 85990: 140931 | 141049 | 141160 | 141205 | 141216 | 141230 | 141257 | 141263 | 141609