Diff
Modified: trunk/LayoutTests/ChangeLog (198911 => 198912)
--- trunk/LayoutTests/ChangeLog 2016-03-31 20:39:24 UTC (rev 198911)
+++ trunk/LayoutTests/ChangeLog 2016-03-31 20:43:41 UTC (rev 198912)
@@ -1,3 +1,58 @@
+2016-03-31 Eric Carlson <[email protected]>
+
+ Rebaseline media control tests when new media control appearances are finalized
+ https://bugs.webkit.org/show_bug.cgi?id=142142
+
+ Reviewed by Brent Fulgham.
+
+ * fullscreen/video-controls-override.html: Test height as an integer.
+ * http/tests/media/hls/video-controls-live-stream.html: Start playback explicitly instead of
+ using autoplay, and pause playback before dumping controls state to make the test results
+ more deterministic.
+ * media/audio-delete-while-slider-thumb-clicked.html: Make the <audio> element wide enough
+ that it will always have a timeline scrubber. Trigger test on 'canplaythrough' instead of
+ autoplay + 'playing' to simplify the test slightly.
+ * media/nodesFromRect-shadowContent.html: Test for controls panel-background instead
+ timeline-container because of changes to the controls structure.
+ * platform/mac-mavericks/media/audio-controls-rendering-expected.png: Removed.
+ * platform/mac-mavericks/media/audio-controls-rendering-expected.txt: Removed.
+ * platform/mac-mavericks/media/video-volume-slider-expected.txt: Removed.
+ * platform/mac-wk1/media/controls-styling-expected.txt: Removed.
+ * platform/mac-yosemite/http/tests/media/hls/video-controls-live-stream-expected.txt: Added
+ * platform/mac-yosemite/media: Added.
+ * platform/mac-yosemite/media/controls-styling-expected.txt: Added.
+ * platform/mac/TestExpectations: Unskip some tests.
+ * platform/mac/accessibility/media-element-expected.txt: Update results.
+ * platform/mac/fast/layers/video-layer-expected.png: Ditto.
+ * platform/mac/fast/layers/video-layer-expected.txt: Ditto.
+ * platform/mac/fullscreen/video-controls-override-expected.txt: Ditto.
+ * platform/mac/http/tests/media/hls/video-controls-live-stream-expected.txt: Ditto.
+ * platform/mac/media/audio-controls-rendering-expected.png: Ditto.
+ * platform/mac/media/audio-controls-rendering-expected.txt: Ditto.
+ * platform/mac/media/controls-after-reload-expected.png: Ditto.
+ * platform/mac/media/controls-after-reload-expected.txt: Ditto.
+ * platform/mac/media/controls-strict-expected.png: Ditto.
+ * platform/mac/media/controls-strict-expected.txt: Ditto.
+ * platform/mac/media/controls-styling-expected.png: Ditto.
+ * platform/mac/media/controls-styling-expected.txt: Ditto.
+ * platform/mac/media/controls-without-preload-expected.png: Ditto.
+ * platform/mac/media/controls-without-preload-expected.txt: Ditto.
+ * platform/mac/media/media-controls-clone-expected.png: Ditto.
+ * platform/mac/media/media-controls-clone-expected.txt: Ditto.
+ * platform/mac/media/media-document-audio-repaint-expected.png: Ditto.
+ * platform/mac/media/video-controls-rendering-expected.png: Ditto.
+ * platform/mac/media/video-controls-rendering-expected.txt: Ditto.
+ * platform/mac/media/video-display-toggle-expected.png: Ditto.
+ * platform/mac/media/video-display-toggle-expected.txt: Ditto.
+ * platform/mac/media/video-empty-source-expected.png: Ditto.
+ * platform/mac/media/video-empty-source-expected.txt: Ditto.
+ * platform/mac/media/video-no-audio-expected.png: Ditto.
+ * platform/mac/media/video-no-audio-expected.txt: Ditto.
+ * platform/mac/media/video-volume-slider-expected.png: Ditto.
+ * platform/mac/media/video-volume-slider-expected.txt: Ditto.
+ * platform/mac/media/video-zoom-controls-expected.png: Ditto.
+ * platform/mac/media/video-zoom-controls-expected.txt: Ditto.
+
2016-03-31 Ryan Haddad <[email protected]>
Moving a few skipped tests from ios-simulator-wk2 to ios-simulator TestExpectations file.
Modified: trunk/LayoutTests/fullscreen/video-controls-override.html (198911 => 198912)
--- trunk/LayoutTests/fullscreen/video-controls-override.html 2016-03-31 20:39:24 UTC (rev 198911)
+++ trunk/LayoutTests/fullscreen/video-controls-override.html 2016-03-31 20:43:41 UTC (rev 198912)
@@ -23,7 +23,7 @@
testExpected("panel = mediaControlsElement(shadowRoot.firstChild, '-webkit-media-controls-panel')", null, "!=");
testExpected("internals.shadowPseudoId(panel)", "-webkit-media-controls-panel");
testExpected("document.defaultView.getComputedStyle(panel)['display']", 'none', "!=");
- testExpected("document.defaultView.getComputedStyle(panel)['height']", '20px', ">=");
+ testExpected("parseInt(document.defaultView.getComputedStyle(panel)['height'])", '20', ">=");
}
else
logResult(false, "window.internals == undefined");
Modified: trunk/LayoutTests/http/tests/media/hls/video-controls-live-stream.html (198911 => 198912)
--- trunk/LayoutTests/http/tests/media/hls/video-controls-live-stream.html 2016-03-31 20:39:24 UTC (rev 198911)
+++ trunk/LayoutTests/http/tests/media/hls/video-controls-live-stream.html 2016-03-31 20:43:41 UTC (rev 198912)
@@ -8,26 +8,30 @@
function start() {
video = document.getElementById('video');
+ waitForEvent('canplaythrough', function() { video.play(); });
waitForEvent('play', playing);
waitForEventAndFail('stalled');
video.src = ""
}
function playing() {
- testExpected('video.duration', Infinity);
+ video.pause();
+ setTimeout(function() {
+ testExpected('video.duration', Infinity);
- controls = internals.shadowRoot(video).firstChild.firstChild;
- dumpMediaControlsTree(controls);
+ controls = internals.shadowRoot(video).firstChild.firstChild;
+ dumpMediaControlsTree(controls);
- timeline = mediaControlsElement(controls, "-webkit-media-controls-timeline");
- test('timeline == null || timeline.disabled', false);
+ timeline = mediaControlsElement(controls, "-webkit-media-controls-timeline");
+ test('timeline == null || timeline.disabled', false);
- endTest();
+ endTest()
+ }, 200);
}
</script>
</head>
<body _onload_="start()">
- <video id="video" autoplay controls></video>
+ <video id="video" controls></video>
</body>
</html>
Modified: trunk/LayoutTests/media/audio-delete-while-slider-thumb-clicked.html (198911 => 198912)
--- trunk/LayoutTests/media/audio-delete-while-slider-thumb-clicked.html 2016-03-31 20:39:24 UTC (rev 198911)
+++ trunk/LayoutTests/media/audio-delete-while-slider-thumb-clicked.html 2016-03-31 20:43:41 UTC (rev 198912)
@@ -1,6 +1,9 @@
<!DOCTYPE html>
<html>
<head>
+ <style>
+ audio { width: 400px; }
+ </style>
<script src=""
<script src=""
<script src=""
@@ -84,7 +87,7 @@
{
setSrcByTagName("audio", findMediaFile("audio", "content/test"));
- // Remove the element after seeking started
+ audio.addEventListener("canplaythrough", drag);
audio.addEventListener("seeking", deleteAudio);
}
@@ -95,7 +98,7 @@
<br>
<input type="button" id="button" value="Click Me!" _onmouseup_="log('button click!')">
<br>
- <audio id="audio" autoplay _onplaying_="drag()" controls></audio><br><br>
+ <audio id="audio" controls></audio><br><br>
<div id="console"></div>
</body>
</html>
Modified: trunk/LayoutTests/media/nodesFromRect-shadowContent.html (198911 => 198912)
--- trunk/LayoutTests/media/nodesFromRect-shadowContent.html 2016-03-31 20:39:24 UTC (rev 198911)
+++ trunk/LayoutTests/media/nodesFromRect-shadowContent.html 2016-03-31 20:43:41 UTC (rev 198912)
@@ -35,7 +35,7 @@
check(clickX, clickY, 100, 100, 20, 20, [e.v1, e.body]);
- var shadow =['-webkit-media-controls-timeline-container', '-webkit-media-controls-play-button', '-webkit-media-controls-panel', '-webkit-media-controls'];
+ var shadow =['-webkit-media-controls-panel-background', '-webkit-media-controls-play-button', '-webkit-media-controls-panel', '-webkit-media-controls'];
checkShadowContent(clickX, clickY, 10, 10, 20, 20, shadow);
}
</script>
Modified: trunk/LayoutTests/platform/mac/TestExpectations (198911 => 198912)
--- trunk/LayoutTests/platform/mac/TestExpectations 2016-03-31 20:39:24 UTC (rev 198911)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2016-03-31 20:43:41 UTC (rev 198912)
@@ -1144,29 +1144,6 @@
webkit.org/b/142726 [ Yosemite+ ] fast/images/animated-png.html [ ImageOnlyFailure ]
-# Skip media control tests until new controls are finalized
-webkit.org/b/142142 media/video-no-audio.html [ Skip ]
-webkit.org/b/142142 media/controls-strict.html [ Skip ]
-webkit.org/b/142142 media/video-volume-slider.html [ Skip ]
-webkit.org/b/142142 media/controls-styling.html [ Skip ]
-webkit.org/b/142142 media/video-display-toggle.html [ Skip ]
-webkit.org/b/142142 media/audio-controls-rendering.html [ Skip ]
-webkit.org/b/142142 media/video-zoom-controls.html [ Skip ]
-webkit.org/b/142142 fast/hidpi/video-controls-in-hidpi.html [ Skip ]
-webkit.org/b/142142 media/video-controls-rendering.html [ Skip ]
-webkit.org/b/142142 accessibility/media-element.html [ Skip ]
-webkit.org/b/142142 media/controls-without-preload.html [ Skip ]
-webkit.org/b/142142 media/media-controls-clone.html [ Skip ]
-webkit.org/b/142142 fast/layers/video-layer.html [ Skip ]
-webkit.org/b/142142 media/video-empty-source.html [ Skip ]
-webkit.org/b/142142 media/audio-delete-while-slider-thumb-clicked.html [ Skip ]
-webkit.org/b/142142 media/controls-after-reload.html [ Skip ]
-webkit.org/b/142142 media/nodesFromRect-shadowContent.html [ Skip ]
-webkit.org/b/142142 media/video-initially-hidden-volume-slider-up.html [ Skip ]
-webkit.org/b/142142 fullscreen/video-controls-override.html [ Skip ]
-webkit.org/b/142142 http/tests/media/hls/video-controls-live-stream.html [ Skip ]
-webkit.org/b/142142 media/video-volume-slider-drag.html [ Skip ]
-
# Fails when an actual AppleTV is nearby.
webkit.org/b/148912 media/controls/airplay-picker.html [ Pass Failure ]
Modified: trunk/LayoutTests/platform/mac/accessibility/media-element-expected.txt (198911 => 198912)
--- trunk/LayoutTests/platform/mac/accessibility/media-element-expected.txt 2016-03-31 20:39:24 UTC (rev 198911)
+++ trunk/LayoutTests/platform/mac/accessibility/media-element-expected.txt 2016-03-31 20:43:41 UTC (rev 198912)
@@ -14,14 +14,26 @@
role: AXRole: AXToolbar
- description: AXDescription: Rewind 30 Seconds
- role: AXRole: AXButton
+ description: AXDescription:
+ role: AXRole: AXGroup
+ description: AXDescription:
+ role: AXRole: AXGroup
+
+
+ description: AXDescription:
+ role: AXRole: AXGroup
+
+
description: AXDescription: Play
role: AXRole: AXButton
+ description: AXDescription: Rewind 30 Seconds
+ role: AXRole: AXButton
+
+
description: AXDescription: Elapsed
role: AXRole: AXGroup
subrole: AXSubrole: AXApplicationTimer
@@ -56,6 +68,14 @@
role: AXRole: AXStaticText
+ description: AXDescription:
+ role: AXRole: AXGroup
+
+
+ description: AXDescription:
+ role: AXRole: AXGroup
+
+
description: AXDescription: Volume
role: AXRole: AXSlider
Modified: trunk/LayoutTests/platform/mac/fast/hidpi/video-controls-in-hidpi-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt (198911 => 198912)
--- trunk/LayoutTests/platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt 2016-03-31 20:39:24 UTC (rev 198911)
+++ trunk/LayoutTests/platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt 2016-03-31 20:43:41 UTC (rev 198912)
@@ -8,17 +8,27 @@
text run at (0,0) width 551: "This test passes if the video controls are non-blurry and properly positioned in HiDPI."
RenderBlock (anonymous) at (0,18) size 784x150
RenderText {#text} at (0,0) size 0x0
-layer at (8,26) size 300x150
+layer at (8,26) size 300x150 isolatesBlending
RenderVideo {VIDEO} at (0,0) size 300x150
layer at (8,26) size 300x150
RenderFlexibleBox {DIV} at (0,0) size 300x150
-layer at (8,151) size 300x25
- RenderFlexibleBox {DIV} at (0,125) size 300x25
-layer at (14,156) size 16x16
- RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
-layer at (40,156) size 16x16
- RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
-layer at (195,160) size 113x9
- RenderFlexibleBox {DIV} at (186,8) size 114x10
-layer at (197,160) size 110x9
- RenderFlexibleBox {DIV} at (2,0) size 110x9
+layer at (8,131) size 300x45
+ RenderFlexibleBox {DIV} at (0,105) size 300x45
+layer at (8,131) size 300x45 isolatesBlending
+ RenderBlock (positioned) {DIV} at (0,0) size 300x45
+layer at (8,131) size 300x45
+ RenderBlock (positioned) {DIV} at (0,0) size 300x45 [bgcolor=#1E1E1E73]
+layer at (8,131) size 300x45 blendMode: lighten
+ RenderBlock (positioned) {DIV} at (0,0) size 300x45 [bgcolor=#292929]
+layer at (16,156) size 12x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (8,25) size 12x15 [color=#FFFFFF]
+layer at (44,156) size 16x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (36,24) size 16x16 [color=#FFFFFF]
+layer at (185,155) size 93x17
+ RenderFlexibleBox {DIV} at (177,24) size 93x17
+layer at (187,155) size 89x17
+ RenderFlexibleBox {DIV} at (2,0) size 89x17
+layer at (286,151) size 14x25
+ RenderFlexibleBox {DIV} at (278,20) size 14x25
+layer at (286,156) size 14x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (0,5) size 14x15 [color=#FFFFFF]
Modified: trunk/LayoutTests/platform/mac/fast/layers/video-layer-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/mac/fast/layers/video-layer-expected.txt (198911 => 198912)
--- trunk/LayoutTests/platform/mac/fast/layers/video-layer-expected.txt 2016-03-31 20:39:24 UTC (rev 198911)
+++ trunk/LayoutTests/platform/mac/fast/layers/video-layer-expected.txt 2016-03-31 20:43:41 UTC (rev 198912)
@@ -13,17 +13,27 @@
RenderBlock (anonymous) at (0,52) size 784x252
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
-layer at (58,110) size 302x152
+layer at (58,110) size 302x152 isolatesBlending
RenderVideo {VIDEO} at (50,50) size 302x152 [border: (1px solid #000000)]
layer at (59,111) size 300x150
RenderFlexibleBox {DIV} at (1,1) size 300x150
-layer at (59,236) size 300x25
- RenderFlexibleBox {DIV} at (0,125) size 300x25
-layer at (65,241) size 16x16
- RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
-layer at (91,241) size 16x16
- RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
-layer at (246,245) size 113x9
- RenderFlexibleBox {DIV} at (186,8) size 114x10
-layer at (248,245) size 110x9
- RenderFlexibleBox {DIV} at (2,0) size 110x9
+layer at (59,216) size 300x45
+ RenderFlexibleBox {DIV} at (0,105) size 300x45
+layer at (59,216) size 300x45 isolatesBlending
+ RenderBlock (positioned) {DIV} at (0,0) size 300x45
+layer at (59,216) size 300x45
+ RenderBlock (positioned) {DIV} at (0,0) size 300x45 [bgcolor=#1E1E1E73]
+layer at (59,216) size 300x45 blendMode: lighten
+ RenderBlock (positioned) {DIV} at (0,0) size 300x45 [bgcolor=#292929]
+layer at (67,241) size 12x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (8,25) size 12x15 [color=#FFFFFF]
+layer at (95,241) size 16x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (36,24) size 16x16 [color=#FFFFFF]
+layer at (236,240) size 93x17
+ RenderFlexibleBox {DIV} at (177,24) size 93x17
+layer at (238,240) size 89x17
+ RenderFlexibleBox {DIV} at (2,0) size 89x17
+layer at (337,236) size 14x25
+ RenderFlexibleBox {DIV} at (278,20) size 14x25
+layer at (337,241) size 14x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (0,5) size 14x15 [color=#FFFFFF]
Modified: trunk/LayoutTests/platform/mac/fullscreen/video-controls-override-expected.txt (198911 => 198912)
--- trunk/LayoutTests/platform/mac/fullscreen/video-controls-override-expected.txt 2016-03-31 20:39:24 UTC (rev 198911)
+++ trunk/LayoutTests/platform/mac/fullscreen/video-controls-override-expected.txt 2016-03-31 20:43:41 UTC (rev 198912)
@@ -6,7 +6,7 @@
EXPECTED (panel = mediaControlsElement(shadowRoot.firstChild, '-webkit-media-controls-panel') != 'null') OK
EXPECTED (internals.shadowPseudoId(panel) == '-webkit-media-controls-panel') OK
EXPECTED (document.defaultView.getComputedStyle(panel)['display'] != 'none') OK
-EXPECTED (document.defaultView.getComputedStyle(panel)['height'] >= '20px') OK
+EXPECTED (parseInt(document.defaultView.getComputedStyle(panel)['height']) >= '20') OK
EVENT(webkitfullscreenchange)
EXPECTED (document.defaultView.getComputedStyle(panel)['display'] == 'none'), OBSERVED '' FAIL
END OF TEST
Modified: trunk/LayoutTests/platform/mac/http/tests/media/hls/video-controls-live-stream-expected.txt (198911 => 198912)
--- trunk/LayoutTests/platform/mac/http/tests/media/hls/video-controls-live-stream-expected.txt 2016-03-31 20:39:24 UTC (rev 198911)
+++ trunk/LayoutTests/platform/mac/http/tests/media/hls/video-controls-live-stream-expected.txt 2016-03-31 20:43:41 UTC (rev 198912)
@@ -1,13 +1,23 @@
+EVENT(canplaythrough)
EVENT(play)
EXPECTED (video.duration == 'Infinity') OK
-webkit-media-text-track-container: classes: [hidden]
+-webkit-media-show-controls: classes: []
-webkit-media-controls-wireless-playback-status: classes: [hidden]
--webkit-media-controls-panel: classes: [paused]
+-webkit-media-controls-wireless-playback-text: classes: []
+-webkit-media-controls-wireless-playback-text-top: classes: []
+-webkit-media-controls-wireless-playback-text-bottom: classes: []
+-webkit-media-controls-panel: classes: [show paused]
+-webkit-media-controls-panel-background-container: classes: []
+-webkit-media-controls-panel-background: classes: [show paused]
+-webkit-media-controls-panel-tint: classes: []
-webkit-media-controls-play-button: classes: [paused]
-webkit-media-controls-status-display: classes: []
none: classes: [mute-box]
-webkit-media-controls-volume-slider-container: classes: [volume-box]
+-webkit-media-controls-volume-slider-container-background: classes: []
+-webkit-media-controls-volume-slider-container-tint: classes: []
-webkit-media-controls-volume-slider: classes: []
-webkit-media-controls-mute-button: classes: []
-webkit-media-controls-wireless-playback-picker-button: classes: [hidden]
Modified: trunk/LayoutTests/platform/mac/media/audio-controls-rendering-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt (198911 => 198912)
--- trunk/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt 2016-03-31 20:39:24 UTC (rev 198911)
+++ trunk/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt 2016-03-31 20:43:41 UTC (rev 198912)
@@ -18,115 +18,79 @@
RenderFlexibleBox {DIV} at (0,0) size 200x25
layer at (8,42) size 200x25
RenderFlexibleBox {DIV} at (0,0) size 200x25
-layer at (14,47) size 16x16
- RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
-layer at (40,47) size 16x16
- RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
-layer at (57,50) size 127x11
- RenderFlexibleBox {DIV} at (49,7) size 127x12
-layer at (57,50) size 45x11
- RenderFlexibleBox {DIV} at (0,0) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (10,0) size 25x11
- RenderText {#text} at (0,0) size 25x11
- text run at (0,0) width 25: "00:00"
-layer at (139,50) size 45x11
- RenderFlexibleBox {DIV} at (82,0) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (8,0) size 29x11
- RenderText {#text} at (0,0) size 29x11
- text run at (0,0) width 29: "-00:07"
-layer at (104,51) size 33x9
- RenderFlexibleBox {DIV} at (47,1) size 33x9
- RenderSlider {INPUT} at (0,0) size 33x9 [color=#909090] [bgcolor=#4A4A4A]
- RenderFlexibleBox {DIV} at (0,0) size 33x9
- RenderBlock {DIV} at (0,1) size 33x7
-layer at (104,52) size 6x6
- RenderBlock {DIV} at (0,0) size 6x6 [bgcolor=#FFFFFF]
-layer at (184,44) size 22x22
- RenderFlexibleBox {DIV} at (176,2) size 22x22
-layer at (184,44) size 2x22
- RenderFlexibleBox {DIV} at (0,0) size 2x22 [border: (1px solid #000000F3)]
- RenderSlider {INPUT} at (-7,6) size 2x10 [color=#909090] [border: (1px solid #000000DF)]
- RenderFlexibleBox {DIV} at (1,1) size 0x8
- RenderBlock {DIV} at (0,0) size 0x8
-layer at (170,51) size 8x8
- RenderBlock {DIV} at (-8,0) size 8x8
-layer at (187,47) size 16x16
- RenderButton {BUTTON} at (3,3) size 16x16 [color=#FFFFFF]
+layer at (8,42) size 200x25
+ RenderBlock (positioned) {DIV} at (0,0) size 200x25 [bgcolor=#292929]
+layer at (16,47) size 12x15
+ RenderButton {BUTTON} at (8,5) size 12x15 [color=#FFFFFF]
+layer at (44,47) size 16x15
+ RenderButton {BUTTON} at (36,4) size 16x16 [color=#FFFFFF]
+layer at (186,42) size 14x25
+ RenderFlexibleBox {DIV} at (178,0) size 14x25
+layer at (186,47) size 14x15
+ RenderButton {BUTTON} at (0,5) size 14x15 [color=#FFFFFF]
layer at (8,85) size 320x25
RenderFlexibleBox {DIV} at (0,0) size 320x25
layer at (8,85) size 320x25
RenderFlexibleBox {DIV} at (0,0) size 320x25
-layer at (14,90) size 16x16
- RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
-layer at (40,90) size 16x16
- RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
-layer at (57,93) size 247x11
- RenderFlexibleBox {DIV} at (49,7) size 247x12
-layer at (57,93) size 45x11
- RenderFlexibleBox {DIV} at (0,0) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (10,0) size 25x11
- RenderText {#text} at (0,0) size 25x11
- text run at (0,0) width 25: "00:00"
-layer at (259,93) size 45x11
- RenderFlexibleBox {DIV} at (202,0) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (8,0) size 29x11
- RenderText {#text} at (0,0) size 29x11
- text run at (0,0) width 29: "-00:07"
-layer at (104,94) size 153x9
- RenderFlexibleBox {DIV} at (47,1) size 153x9
- RenderSlider {INPUT} at (0,0) size 153x9 [color=#909090] [bgcolor=#4A4A4A]
- RenderFlexibleBox {DIV} at (0,0) size 153x9
- RenderBlock {DIV} at (0,1) size 153x7
-layer at (104,95) size 6x6
- RenderBlock {DIV} at (0,0) size 6x6 [bgcolor=#FFFFFF]
-layer at (304,87) size 22x22
- RenderFlexibleBox {DIV} at (296,2) size 22x22
-layer at (304,87) size 2x22
- RenderFlexibleBox {DIV} at (0,0) size 2x22 [border: (1px solid #000000F3)]
- RenderSlider {INPUT} at (-7,6) size 2x10 [color=#909090] [border: (1px solid #000000DF)]
- RenderFlexibleBox {DIV} at (1,1) size 0x8
- RenderBlock {DIV} at (0,0) size 0x8
-layer at (290,94) size 8x8
- RenderBlock {DIV} at (-8,0) size 8x8
-layer at (307,90) size 16x16
- RenderButton {BUTTON} at (3,3) size 16x16 [color=#FFFFFF]
+layer at (8,85) size 320x25
+ RenderBlock (positioned) {DIV} at (0,0) size 320x25 [bgcolor=#292929]
+layer at (16,90) size 12x15
+ RenderButton {BUTTON} at (8,5) size 12x15 [color=#FFFFFF]
+layer at (44,90) size 16x15
+ RenderButton {BUTTON} at (36,4) size 16x16 [color=#FFFFFF]
+layer at (68,89) size 230x17
+ RenderFlexibleBox {DIV} at (60,4) size 230x17
+layer at (76,91) size 32x13
+ RenderFlexibleBox {DIV} at (8,2) size 32x13 [color=#9C9C9C]
+ RenderBlock (anonymous) at (2,0) size 30x13
+ RenderText {#text} at (0,0) size 30x13
+ text run at (0,0) width 30: "00:00"
+layer at (118,89) size 125x17
+ RenderFlexibleBox {DIV} at (50,0) size 125x17
+ RenderSlider {INPUT} at (0,0) size 125x17 [color=#909090]
+ RenderFlexibleBox {DIV} at (0,0) size 125x17
+ RenderBlock {DIV} at (0,1) size 125x15
+ RenderBlock {DIV} at (0,0) size 3x15
+layer at (253,91) size 37x13
+ RenderFlexibleBox {DIV} at (185,2) size 37x13 [color=#9C9C9C]
+ RenderBlock (anonymous) at (0,0) size 35x13
+ RenderText {#text} at (0,0) size 35x13
+ text run at (0,0) width 35: "-00:07"
+layer at (306,85) size 14x25
+ RenderFlexibleBox {DIV} at (298,0) size 14x25
+layer at (306,90) size 14x15
+ RenderButton {BUTTON} at (0,5) size 14x15 [color=#FFFFFF]
layer at (8,128) size 320x100
RenderMedia {AUDIO} at (8,128) size 320x100 [bgcolor=#0000FF]
layer at (8,128) size 320x100
RenderFlexibleBox {DIV} at (0,0) size 320x100
layer at (8,203) size 320x25
RenderFlexibleBox {DIV} at (0,75) size 320x25
-layer at (14,208) size 16x16
- RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
-layer at (40,208) size 16x16
- RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
-layer at (57,211) size 247x11
- RenderFlexibleBox {DIV} at (49,7) size 247x12
-layer at (57,211) size 45x11
- RenderFlexibleBox {DIV} at (0,0) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (10,0) size 25x11
- RenderText {#text} at (0,0) size 25x11
- text run at (0,0) width 25: "00:00"
-layer at (259,211) size 45x11
- RenderFlexibleBox {DIV} at (202,0) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (8,0) size 29x11
- RenderText {#text} at (0,0) size 29x11
- text run at (0,0) width 29: "-00:07"
-layer at (104,212) size 153x9
- RenderFlexibleBox {DIV} at (47,1) size 153x9
- RenderSlider {INPUT} at (0,0) size 153x9 [color=#909090] [bgcolor=#4A4A4A]
- RenderFlexibleBox {DIV} at (0,0) size 153x9
- RenderBlock {DIV} at (0,1) size 153x7
-layer at (104,213) size 6x6
- RenderBlock {DIV} at (0,0) size 6x6 [bgcolor=#FFFFFF]
-layer at (304,205) size 22x22
- RenderFlexibleBox {DIV} at (296,2) size 22x22
-layer at (304,205) size 2x22
- RenderFlexibleBox {DIV} at (0,0) size 2x22 [border: (1px solid #000000F3)]
- RenderSlider {INPUT} at (-7,6) size 2x10 [color=#909090] [border: (1px solid #000000DF)]
- RenderFlexibleBox {DIV} at (1,1) size 0x8
- RenderBlock {DIV} at (0,0) size 0x8
-layer at (290,212) size 8x8
- RenderBlock {DIV} at (-8,0) size 8x8
-layer at (307,208) size 16x16
- RenderButton {BUTTON} at (3,3) size 16x16 [color=#FFFFFF]
+layer at (8,203) size 320x25
+ RenderBlock (positioned) {DIV} at (0,0) size 320x25 [bgcolor=#292929]
+layer at (16,208) size 12x15
+ RenderButton {BUTTON} at (8,5) size 12x15 [color=#FFFFFF]
+layer at (44,208) size 16x15
+ RenderButton {BUTTON} at (36,4) size 16x16 [color=#FFFFFF]
+layer at (68,207) size 230x17
+ RenderFlexibleBox {DIV} at (60,4) size 230x17
+layer at (76,209) size 32x13
+ RenderFlexibleBox {DIV} at (8,2) size 32x13 [color=#9C9C9C]
+ RenderBlock (anonymous) at (2,0) size 30x13
+ RenderText {#text} at (0,0) size 30x13
+ text run at (0,0) width 30: "00:00"
+layer at (118,207) size 125x17
+ RenderFlexibleBox {DIV} at (50,0) size 125x17
+ RenderSlider {INPUT} at (0,0) size 125x17 [color=#909090]
+ RenderFlexibleBox {DIV} at (0,0) size 125x17
+ RenderBlock {DIV} at (0,1) size 125x15
+ RenderBlock {DIV} at (0,0) size 3x15
+layer at (253,209) size 37x13
+ RenderFlexibleBox {DIV} at (185,2) size 37x13 [color=#9C9C9C]
+ RenderBlock (anonymous) at (0,0) size 35x13
+ RenderText {#text} at (0,0) size 35x13
+ text run at (0,0) width 35: "-00:07"
+layer at (306,203) size 14x25
+ RenderFlexibleBox {DIV} at (298,0) size 14x25
+layer at (306,208) size 14x15
+ RenderButton {BUTTON} at (0,5) size 14x15 [color=#FFFFFF]
Modified: trunk/LayoutTests/platform/mac/media/controls-after-reload-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/mac/media/controls-after-reload-expected.txt (198911 => 198912)
--- trunk/LayoutTests/platform/mac/media/controls-after-reload-expected.txt 2016-03-31 20:39:24 UTC (rev 198911)
+++ trunk/LayoutTests/platform/mac/media/controls-after-reload-expected.txt 2016-03-31 20:43:41 UTC (rev 198912)
@@ -8,45 +8,44 @@
text run at (0,0) width 368: "Making sure the controller looks ok after a second load()."
RenderBlock (anonymous) at (0,34) size 784x240
RenderText {#text} at (0,0) size 0x0
-layer at (8,42) size 320x240
+layer at (8,42) size 320x240 isolatesBlending
RenderVideo {VIDEO} at (0,0) size 320x240
layer at (8,42) size 320x240
RenderFlexibleBox {DIV} at (0,0) size 320x240
-layer at (8,257) size 320x25
- RenderFlexibleBox {DIV} at (0,215) size 320x25
-layer at (14,262) size 16x16
- RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
-layer at (40,262) size 16x16
- RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
-layer at (57,265) size 217x11
- RenderFlexibleBox {DIV} at (49,7) size 217x12
-layer at (57,265) size 45x11
- RenderFlexibleBox {DIV} at (0,0) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (10,0) size 25x11
- RenderText {#text} at (0,0) size 25x11
- text run at (0,0) width 25: "00:00"
-layer at (229,265) size 45x11
- RenderFlexibleBox {DIV} at (172,0) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (8,0) size 29x11
- RenderText {#text} at (0,0) size 29x11
- text run at (0,0) width 29: "-00:06"
-layer at (104,266) size 123x9
- RenderFlexibleBox {DIV} at (47,1) size 123x9
- RenderSlider {INPUT} at (0,0) size 123x9 [color=#909090] [bgcolor=#4A4A4A]
- RenderFlexibleBox {DIV} at (0,0) size 123x9
- RenderBlock {DIV} at (0,1) size 123x7
-layer at (104,267) size 6x6
- RenderBlock {DIV} at (0,0) size 6x6 [bgcolor=#FFFFFF]
-layer at (274,259) size 22x22
- RenderFlexibleBox {DIV} at (266,2) size 22x22
-layer at (274,259) size 2x22
- RenderFlexibleBox {DIV} at (0,0) size 2x22 [border: (1px solid #000000F3)]
- RenderSlider {INPUT} at (-7,6) size 2x10 [color=#909090] [border: (1px solid #000000DF)]
- RenderFlexibleBox {DIV} at (1,1) size 0x8
- RenderBlock {DIV} at (0,0) size 0x8
-layer at (260,266) size 8x8
- RenderBlock {DIV} at (-8,0) size 8x8
-layer at (277,262) size 16x16
- RenderButton {BUTTON} at (3,3) size 16x16 [color=#FFFFFF]
-layer at (305,262) size 16x16
- RenderButton {BUTTON} at (297,5) size 16x16 [color=#FFFFFF]
+layer at (8,237) size 320x45
+ RenderFlexibleBox {DIV} at (0,195) size 320x45
+layer at (8,237) size 320x45 isolatesBlending
+ RenderBlock (positioned) {DIV} at (0,0) size 320x45
+layer at (8,237) size 320x45
+ RenderBlock (positioned) {DIV} at (0,0) size 320x45 [bgcolor=#1E1E1E73]
+layer at (8,237) size 320x45 blendMode: lighten
+ RenderBlock (positioned) {DIV} at (0,0) size 320x45 [bgcolor=#292929]
+layer at (16,262) size 12x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (8,25) size 12x15 [color=#FFFFFF]
+layer at (44,262) size 16x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (36,24) size 16x16 [color=#FFFFFF]
+layer at (68,261) size 201x17
+ RenderFlexibleBox {DIV} at (60,24) size 201x17
+layer at (76,263) size 32x13 blendMode: plus-lighter
+ RenderFlexibleBox {DIV} at (8,2) size 32x13 [color=#FFFFFF]
+ RenderBlock (anonymous) at (2,0) size 30x13
+ RenderText {#text} at (0,0) size 30x13
+ text run at (0,0) width 30: "00:00"
+layer at (118,261) size 96x17
+ RenderFlexibleBox {DIV} at (50,0) size 96x17
+layer at (118,261) size 96x17 blendMode: plus-lighter
+ RenderSlider {INPUT} at (0,0) size 96x17 [color=#909090]
+ RenderFlexibleBox {DIV} at (0,0) size 96x17
+ RenderBlock {DIV} at (0,1) size 96x15
+ RenderBlock {DIV} at (0,0) size 3x15
+layer at (224,263) size 37x13 blendMode: plus-lighter
+ RenderFlexibleBox {DIV} at (156,2) size 37x13 [color=#FFFFFF]
+ RenderBlock (anonymous) at (0,0) size 35x13
+ RenderText {#text} at (0,0) size 35x13
+ text run at (0,0) width 35: "-00:06"
+layer at (277,257) size 14x25
+ RenderFlexibleBox {DIV} at (269,20) size 14x25
+layer at (277,262) size 14x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (0,5) size 14x15 [color=#FFFFFF]
+layer at (307,262) size 14x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (299,25) size 14x15 [color=#FFFFFF]
Modified: trunk/LayoutTests/platform/mac/media/controls-strict-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/mac/media/controls-strict-expected.txt (198911 => 198912)
--- trunk/LayoutTests/platform/mac/media/controls-strict-expected.txt 2016-03-31 20:39:24 UTC (rev 198911)
+++ trunk/LayoutTests/platform/mac/media/controls-strict-expected.txt 2016-03-31 20:43:41 UTC (rev 198912)
@@ -8,45 +8,44 @@
text run at (0,0) width 232: "Drawing the controls in strict mode."
RenderBlock (anonymous) at (0,34) size 784x244
RenderText {#text} at (0,0) size 0x0
-layer at (8,50) size 320x240
+layer at (8,50) size 320x240 isolatesBlending
RenderVideo {VIDEO} at (0,0) size 320x240
layer at (8,50) size 320x240
RenderFlexibleBox {DIV} at (0,0) size 320x240
-layer at (8,265) size 320x25
- RenderFlexibleBox {DIV} at (0,215) size 320x25
-layer at (14,270) size 16x16
- RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
-layer at (40,270) size 16x16
- RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
-layer at (57,273) size 217x11
- RenderFlexibleBox {DIV} at (49,7) size 217x12
-layer at (57,273) size 45x11
- RenderFlexibleBox {DIV} at (0,0) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (10,0) size 25x11
- RenderText {#text} at (0,0) size 25x11
- text run at (0,0) width 25: "00:00"
-layer at (229,273) size 45x11
- RenderFlexibleBox {DIV} at (172,0) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (8,0) size 29x11
- RenderText {#text} at (0,0) size 29x11
- text run at (0,0) width 29: "-00:06"
-layer at (104,274) size 123x9
- RenderFlexibleBox {DIV} at (47,1) size 123x9
- RenderSlider {INPUT} at (0,0) size 123x9 [color=#909090] [bgcolor=#4A4A4A]
- RenderFlexibleBox {DIV} at (0,0) size 123x9
- RenderBlock {DIV} at (0,1) size 123x7
-layer at (104,275) size 6x6
- RenderBlock {DIV} at (0,0) size 6x6 [bgcolor=#FFFFFF]
-layer at (274,267) size 22x22
- RenderFlexibleBox {DIV} at (266,2) size 22x22
-layer at (274,267) size 2x22
- RenderFlexibleBox {DIV} at (0,0) size 2x22 [border: (1px solid #000000F3)]
- RenderSlider {INPUT} at (-7,6) size 2x10 [color=#909090] [border: (1px solid #000000DF)]
- RenderFlexibleBox {DIV} at (1,1) size 0x8
- RenderBlock {DIV} at (0,0) size 0x8
-layer at (260,274) size 8x8
- RenderBlock {DIV} at (-8,0) size 8x8
-layer at (277,270) size 16x16
- RenderButton {BUTTON} at (3,3) size 16x16 [color=#FFFFFF]
-layer at (305,270) size 16x16
- RenderButton {BUTTON} at (297,5) size 16x16 [color=#FFFFFF]
+layer at (8,245) size 320x45
+ RenderFlexibleBox {DIV} at (0,195) size 320x45
+layer at (8,245) size 320x45 isolatesBlending
+ RenderBlock (positioned) {DIV} at (0,0) size 320x45
+layer at (8,245) size 320x45
+ RenderBlock (positioned) {DIV} at (0,0) size 320x45 [bgcolor=#1E1E1E73]
+layer at (8,245) size 320x45 blendMode: lighten
+ RenderBlock (positioned) {DIV} at (0,0) size 320x45 [bgcolor=#292929]
+layer at (16,270) size 12x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (8,25) size 12x15 [color=#FFFFFF]
+layer at (44,270) size 16x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (36,24) size 16x16 [color=#FFFFFF]
+layer at (68,269) size 201x17
+ RenderFlexibleBox {DIV} at (60,24) size 201x17
+layer at (76,271) size 32x13 blendMode: plus-lighter
+ RenderFlexibleBox {DIV} at (8,2) size 32x13 [color=#FFFFFF]
+ RenderBlock (anonymous) at (2,0) size 30x13
+ RenderText {#text} at (0,0) size 30x13
+ text run at (0,0) width 30: "00:00"
+layer at (118,269) size 96x17
+ RenderFlexibleBox {DIV} at (50,0) size 96x17
+layer at (118,269) size 96x17 blendMode: plus-lighter
+ RenderSlider {INPUT} at (0,0) size 96x17 [color=#909090]
+ RenderFlexibleBox {DIV} at (0,0) size 96x17
+ RenderBlock {DIV} at (0,1) size 96x15
+ RenderBlock {DIV} at (0,0) size 3x15
+layer at (224,271) size 37x13 blendMode: plus-lighter
+ RenderFlexibleBox {DIV} at (156,2) size 37x13 [color=#FFFFFF]
+ RenderBlock (anonymous) at (0,0) size 35x13
+ RenderText {#text} at (0,0) size 35x13
+ text run at (0,0) width 35: "-00:06"
+layer at (277,265) size 14x25
+ RenderFlexibleBox {DIV} at (269,20) size 14x25
+layer at (277,270) size 14x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (0,5) size 14x15 [color=#FFFFFF]
+layer at (307,270) size 14x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (299,25) size 14x15 [color=#FFFFFF]
Modified: trunk/LayoutTests/platform/mac/media/controls-styling-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/mac/media/controls-styling-expected.txt (198911 => 198912)
--- trunk/LayoutTests/platform/mac/media/controls-styling-expected.txt 2016-03-31 20:39:24 UTC (rev 198911)
+++ trunk/LayoutTests/platform/mac/media/controls-styling-expected.txt 2016-03-31 20:43:41 UTC (rev 198912)
@@ -4,97 +4,91 @@
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {P} at (0,0) size 784x18
- RenderText {#text} at (0,0) size 274x18
- text run at (0,0) width 274: "The look of the controls should not change."
+ RenderText {#text} at (0,0) size 279x18
+ text run at (0,0) width 279: "The look of the controls should not change."
RenderBlock {DIV} at (0,34) size 784x240 [color=#0000FF]
RenderText {#text} at (0,0) size 0x0
RenderBlock (anonymous) at (0,274) size 784x240
RenderText {#text} at (0,0) size 0x0
-layer at (18,42) size 320x240
+layer at (18,42) size 320x240 isolatesBlending
RenderVideo {VIDEO} at (10,0) size 320x240
-layer at (8,282) size 320x240
- RenderVideo {VIDEO} at (0,0) size 320x240
layer at (18,42) size 320x240
RenderFlexibleBox {DIV} at (0,0) size 320x240
-layer at (18,257) size 320x25
- RenderBlock {DIV} at (0,215) size 320x25
-layer at (18,257) size 320x25
- RenderFlexibleBox {DIV} at (0,0) size 320x25
-layer at (24,262) size 16x16
- RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
-layer at (50,262) size 16x16
- RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
-layer at (67,265) size 217x11
- RenderFlexibleBox {DIV} at (49,7) size 217x12
-layer at (67,265) size 45x11
- RenderFlexibleBox {DIV} at (0,0) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (10,0) size 25x11
- RenderText {#text} at (0,0) size 25x11
- text run at (0,0) width 25: "00:00"
-layer at (239,265) size 45x11
- RenderFlexibleBox {DIV} at (172,0) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (8,0) size 29x11
- RenderText {#text} at (0,0) size 29x11
- text run at (0,0) width 29: "-00:06"
-layer at (114,266) size 123x9
- RenderFlexibleBox {DIV} at (47,1) size 123x9
- RenderSlider {INPUT} at (0,0) size 123x9 [color=#909090] [bgcolor=#4A4A4A]
- RenderFlexibleBox {DIV} at (0,0) size 123x9
- RenderBlock {DIV} at (0,1) size 123x7
-layer at (114,267) size 6x6
- RenderBlock {DIV} at (0,0) size 6x6 [bgcolor=#FFFFFF]
-layer at (284,259) size 22x22
- RenderFlexibleBox {DIV} at (266,2) size 22x22
-layer at (284,259) size 2x22
- RenderFlexibleBox {DIV} at (0,0) size 2x22 [border: (1px solid #000000F3)]
- RenderSlider {INPUT} at (-7,6) size 2x10 [color=#909090] [border: (1px solid #000000DF)]
- RenderFlexibleBox {DIV} at (1,1) size 0x8
- RenderBlock {DIV} at (0,0) size 0x8
-layer at (270,266) size 8x8
- RenderBlock {DIV} at (-8,0) size 8x8
-layer at (287,262) size 16x16
- RenderButton {BUTTON} at (3,3) size 16x16 [color=#FFFFFF]
-layer at (315,262) size 16x16
- RenderButton {BUTTON} at (297,5) size 16x16 [color=#FFFFFF]
+layer at (18,237) size 320x45
+ RenderFlexibleBox {DIV} at (0,195) size 320x45
+layer at (18,237) size 320x45 isolatesBlending
+ RenderBlock (positioned) {DIV} at (0,0) size 320x45
+layer at (18,237) size 320x45
+ RenderBlock (positioned) {DIV} at (0,0) size 320x45 [bgcolor=#1E1E1E73]
+layer at (18,237) size 320x45 blendMode: lighten
+ RenderBlock (positioned) {DIV} at (0,0) size 320x45 [bgcolor=#292929]
+layer at (26,262) size 12x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (8,25) size 12x15 [color=#FFFFFF]
+layer at (54,262) size 16x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (36,24) size 16x16 [color=#FFFFFF]
+layer at (78,261) size 201x17
+ RenderFlexibleBox {DIV} at (60,24) size 201x17
+layer at (86,263) size 32x13 blendMode: plus-lighter
+ RenderFlexibleBox {DIV} at (8,2) size 32x13 [color=#FFFFFF]
+ RenderBlock (anonymous) at (2,0) size 30x13
+ RenderText {#text} at (0,0) size 30x13
+ text run at (0,0) width 30: "00:00"
+layer at (128,261) size 96x17
+ RenderFlexibleBox {DIV} at (50,0) size 96x17
+layer at (128,261) size 96x17 blendMode: plus-lighter
+ RenderSlider {INPUT} at (0,0) size 96x17 [color=#909090]
+ RenderFlexibleBox {DIV} at (0,0) size 96x17
+ RenderBlock {DIV} at (0,1) size 96x15
+ RenderBlock {DIV} at (0,0) size 3x15
+layer at (234,263) size 37x13 blendMode: plus-lighter
+ RenderFlexibleBox {DIV} at (156,2) size 37x13 [color=#FFFFFF]
+ RenderBlock (anonymous) at (0,0) size 35x13
+ RenderText {#text} at (0,0) size 35x13
+ text run at (0,0) width 35: "-00:06"
+layer at (287,257) size 14x25
+ RenderFlexibleBox {DIV} at (269,20) size 14x25
+layer at (287,262) size 14x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (0,5) size 14x15 [color=#FFFFFF]
+layer at (317,262) size 14x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (299,25) size 14x15 [color=#FFFFFF]
+layer at (8,282) size 320x240 isolatesBlending
+ RenderVideo {VIDEO} at (0,0) size 320x240
layer at (8,282) size 320x240
RenderFlexibleBox {DIV} at (0,0) size 320x240
-layer at (8,497) size 320x25
- RenderBlock {DIV} at (0,215) size 320x25
-layer at (8,497) size 320x25
- RenderFlexibleBox {DIV} at (0,0) size 320x25
-layer at (14,502) size 16x16
- RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
-layer at (40,502) size 16x16
- RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
-layer at (57,505) size 217x11
- RenderFlexibleBox {DIV} at (49,7) size 217x12
-layer at (57,505) size 45x11
- RenderFlexibleBox {DIV} at (0,0) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (10,0) size 25x11
- RenderText {#text} at (0,0) size 25x11
- text run at (0,0) width 25: "00:00"
-layer at (229,505) size 45x11
- RenderFlexibleBox {DIV} at (172,0) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (8,0) size 29x11
- RenderText {#text} at (0,0) size 29x11
- text run at (0,0) width 29: "-00:06"
-layer at (104,506) size 123x9
- RenderFlexibleBox {DIV} at (47,1) size 123x9
- RenderSlider {INPUT} at (0,0) size 123x9 [color=#909090] [bgcolor=#4A4A4A]
- RenderFlexibleBox {DIV} at (0,0) size 123x9
- RenderBlock {DIV} at (0,1) size 123x7
-layer at (104,507) size 6x6
- RenderBlock {DIV} at (0,0) size 6x6 [bgcolor=#FFFFFF]
-layer at (274,499) size 22x22
- RenderFlexibleBox {DIV} at (266,2) size 22x22
-layer at (274,499) size 2x22
- RenderFlexibleBox {DIV} at (0,0) size 2x22 [border: (1px solid #000000F3)]
- RenderSlider {INPUT} at (-7,6) size 2x10 [color=#909090] [border: (1px solid #000000DF)]
- RenderFlexibleBox {DIV} at (1,1) size 0x8
- RenderBlock {DIV} at (0,0) size 0x8
-layer at (260,506) size 8x8
- RenderBlock {DIV} at (-8,0) size 8x8
-layer at (277,502) size 16x16
- RenderButton {BUTTON} at (3,3) size 16x16 [color=#FFFFFF]
-layer at (305,502) size 16x16
- RenderButton {BUTTON} at (297,5) size 16x16 [color=#FFFFFF]
+layer at (8,477) size 320x45
+ RenderFlexibleBox {DIV} at (0,195) size 320x45
+layer at (8,477) size 320x45 isolatesBlending
+ RenderBlock (positioned) {DIV} at (0,0) size 320x45
+layer at (8,477) size 320x45
+ RenderBlock (positioned) {DIV} at (0,0) size 320x45 [bgcolor=#1E1E1E73]
+layer at (8,477) size 320x45 blendMode: lighten
+ RenderBlock (positioned) {DIV} at (0,0) size 320x45 [bgcolor=#292929]
+layer at (16,502) size 12x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (8,25) size 12x15 [color=#FFFFFF]
+layer at (44,502) size 16x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (36,24) size 16x16 [color=#FFFFFF]
+layer at (68,501) size 201x17
+ RenderFlexibleBox {DIV} at (60,24) size 201x17
+layer at (76,503) size 32x13 blendMode: plus-lighter
+ RenderFlexibleBox {DIV} at (8,2) size 32x13 [color=#FFFFFF]
+ RenderBlock (anonymous) at (2,0) size 30x13
+ RenderText {#text} at (0,0) size 30x13
+ text run at (0,0) width 30: "00:00"
+layer at (118,501) size 96x17
+ RenderFlexibleBox {DIV} at (50,0) size 96x17
+layer at (118,501) size 96x17 blendMode: plus-lighter
+ RenderSlider {INPUT} at (0,0) size 96x17 [color=#909090]
+ RenderFlexibleBox {DIV} at (0,0) size 96x17
+ RenderBlock {DIV} at (0,1) size 96x15
+ RenderBlock {DIV} at (0,0) size 3x15
+layer at (224,503) size 37x13 blendMode: plus-lighter
+ RenderFlexibleBox {DIV} at (156,2) size 37x13 [color=#FFFFFF]
+ RenderBlock (anonymous) at (0,0) size 35x13
+ RenderText {#text} at (0,0) size 35x13
+ text run at (0,0) width 35: "-00:06"
+layer at (277,497) size 14x25
+ RenderFlexibleBox {DIV} at (269,20) size 14x25
+layer at (277,502) size 14x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (0,5) size 14x15 [color=#FFFFFF]
+layer at (307,502) size 14x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (299,25) size 14x15 [color=#FFFFFF]
Modified: trunk/LayoutTests/platform/mac/media/controls-without-preload-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/mac/media/controls-without-preload-expected.txt (198911 => 198912)
--- trunk/LayoutTests/platform/mac/media/controls-without-preload-expected.txt 2016-03-31 20:39:24 UTC (rev 198911)
+++ trunk/LayoutTests/platform/mac/media/controls-without-preload-expected.txt 2016-03-31 20:43:41 UTC (rev 198912)
@@ -8,45 +8,44 @@
text run at (0,0) width 317: "The controls should not depend on preload value."
RenderBlock (anonymous) at (0,34) size 784x240
RenderText {#text} at (0,0) size 0x0
-layer at (8,42) size 320x240
+layer at (8,42) size 320x240 isolatesBlending
RenderVideo {VIDEO} at (0,0) size 320x240
layer at (8,42) size 320x240
RenderFlexibleBox {DIV} at (0,0) size 320x240
-layer at (8,257) size 320x25
- RenderFlexibleBox {DIV} at (0,215) size 320x25
-layer at (14,262) size 16x16
- RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
-layer at (40,262) size 16x16
- RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
-layer at (57,265) size 217x11
- RenderFlexibleBox {DIV} at (49,7) size 217x12
-layer at (57,265) size 45x11
- RenderFlexibleBox {DIV} at (0,0) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (10,0) size 25x11
- RenderText {#text} at (0,0) size 25x11
- text run at (0,0) width 25: "00:00"
-layer at (229,265) size 45x11
- RenderFlexibleBox {DIV} at (172,0) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (8,0) size 29x11
- RenderText {#text} at (0,0) size 29x11
- text run at (0,0) width 29: "-00:06"
-layer at (104,266) size 123x9
- RenderFlexibleBox {DIV} at (47,1) size 123x9
- RenderSlider {INPUT} at (0,0) size 123x9 [color=#909090] [bgcolor=#4A4A4A]
- RenderFlexibleBox {DIV} at (0,0) size 123x9
- RenderBlock {DIV} at (0,1) size 123x7
-layer at (104,267) size 6x6
- RenderBlock {DIV} at (0,0) size 6x6 [bgcolor=#FFFFFF]
-layer at (274,259) size 22x22
- RenderFlexibleBox {DIV} at (266,2) size 22x22
-layer at (274,259) size 2x22
- RenderFlexibleBox {DIV} at (0,0) size 2x22 [border: (1px solid #000000F3)]
- RenderSlider {INPUT} at (-7,6) size 2x10 [color=#909090] [border: (1px solid #000000DF)]
- RenderFlexibleBox {DIV} at (1,1) size 0x8
- RenderBlock {DIV} at (0,0) size 0x8
-layer at (260,266) size 8x8
- RenderBlock {DIV} at (-8,0) size 8x8
-layer at (277,262) size 16x16
- RenderButton {BUTTON} at (3,3) size 16x16 [color=#FFFFFF]
-layer at (305,262) size 16x16
- RenderButton {BUTTON} at (297,5) size 16x16 [color=#FFFFFF]
+layer at (8,237) size 320x45
+ RenderFlexibleBox {DIV} at (0,195) size 320x45
+layer at (8,237) size 320x45 isolatesBlending
+ RenderBlock (positioned) {DIV} at (0,0) size 320x45
+layer at (8,237) size 320x45
+ RenderBlock (positioned) {DIV} at (0,0) size 320x45 [bgcolor=#1E1E1E73]
+layer at (8,237) size 320x45 blendMode: lighten
+ RenderBlock (positioned) {DIV} at (0,0) size 320x45 [bgcolor=#292929]
+layer at (16,262) size 12x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (8,25) size 12x15 [color=#FFFFFF]
+layer at (44,262) size 16x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (36,24) size 16x16 [color=#FFFFFF]
+layer at (68,261) size 201x17
+ RenderFlexibleBox {DIV} at (60,24) size 201x17
+layer at (76,263) size 32x13 blendMode: plus-lighter
+ RenderFlexibleBox {DIV} at (8,2) size 32x13 [color=#FFFFFF]
+ RenderBlock (anonymous) at (2,0) size 30x13
+ RenderText {#text} at (0,0) size 30x13
+ text run at (0,0) width 30: "00:00"
+layer at (118,261) size 96x17
+ RenderFlexibleBox {DIV} at (50,0) size 96x17
+layer at (118,261) size 96x17 blendMode: plus-lighter
+ RenderSlider {INPUT} at (0,0) size 96x17 [color=#909090]
+ RenderFlexibleBox {DIV} at (0,0) size 96x17
+ RenderBlock {DIV} at (0,1) size 96x15
+ RenderBlock {DIV} at (0,0) size 3x15
+layer at (224,263) size 37x13 blendMode: plus-lighter
+ RenderFlexibleBox {DIV} at (156,2) size 37x13 [color=#FFFFFF]
+ RenderBlock (anonymous) at (0,0) size 35x13
+ RenderText {#text} at (0,0) size 35x13
+ text run at (0,0) width 35: "-00:06"
+layer at (277,257) size 14x25
+ RenderFlexibleBox {DIV} at (269,20) size 14x25
+layer at (277,262) size 14x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (0,5) size 14x15 [color=#FFFFFF]
+layer at (307,262) size 14x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (299,25) size 14x15 [color=#FFFFFF]
Modified: trunk/LayoutTests/platform/mac/media/media-controls-clone-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/mac/media/media-controls-clone-expected.txt (198911 => 198912)
--- trunk/LayoutTests/platform/mac/media/media-controls-clone-expected.txt 2016-03-31 20:39:24 UTC (rev 198911)
+++ trunk/LayoutTests/platform/mac/media/media-controls-clone-expected.txt 2016-03-31 20:43:41 UTC (rev 198912)
@@ -7,55 +7,79 @@
RenderMedia {AUDIO} at (300,125) size 200x25
RenderBlock {DIV} at (0,154) size 784x154
RenderMedia {AUDIO} at (300,125) size 200x25
+layer at (8,8) size 300x150 isolatesBlending
+ RenderVideo {VIDEO} at (0,0) size 300x150
layer at (8,8) size 300x150
+ RenderFlexibleBox {DIV} at (0,0) size 300x150
+layer at (8,113) size 300x45
+ RenderFlexibleBox {DIV} at (0,105) size 300x45
+layer at (8,113) size 300x45 isolatesBlending
+ RenderBlock (positioned) {DIV} at (0,0) size 300x45
+layer at (8,113) size 300x45
+ RenderBlock (positioned) {DIV} at (0,0) size 300x45 [bgcolor=#1E1E1E73]
+layer at (8,113) size 300x45 blendMode: lighten
+ RenderBlock (positioned) {DIV} at (0,0) size 300x45 [bgcolor=#292929]
+layer at (16,138) size 12x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (8,25) size 12x15 [color=#FFFFFF]
+layer at (44,138) size 16x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (36,24) size 16x16 [color=#FFFFFF]
+layer at (185,137) size 93x17
+ RenderFlexibleBox {DIV} at (177,24) size 93x17
+layer at (187,137) size 89x17
+ RenderFlexibleBox {DIV} at (2,0) size 89x17
+layer at (286,133) size 14x25
+ RenderFlexibleBox {DIV} at (278,20) size 14x25
+layer at (286,138) size 14x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (0,5) size 14x15 [color=#FFFFFF]
+layer at (8,162) size 300x150 isolatesBlending
RenderVideo {VIDEO} at (0,0) size 300x150
layer at (8,162) size 300x150
- RenderVideo {VIDEO} at (0,0) size 300x150
-layer at (8,8) size 300x150
RenderFlexibleBox {DIV} at (0,0) size 300x150
-layer at (8,133) size 300x25
- RenderFlexibleBox {DIV} at (0,125) size 300x25
-layer at (14,138) size 16x16
- RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
-layer at (40,138) size 16x16
- RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
-layer at (195,142) size 113x9
- RenderFlexibleBox {DIV} at (186,8) size 114x10
-layer at (197,142) size 110x9
- RenderFlexibleBox {DIV} at (2,0) size 110x9
+layer at (8,267) size 300x45
+ RenderFlexibleBox {DIV} at (0,105) size 300x45
+layer at (8,267) size 300x45 isolatesBlending
+ RenderBlock (positioned) {DIV} at (0,0) size 300x45
+layer at (8,267) size 300x45
+ RenderBlock (positioned) {DIV} at (0,0) size 300x45 [bgcolor=#1E1E1E73]
+layer at (8,267) size 300x45 blendMode: lighten
+ RenderBlock (positioned) {DIV} at (0,0) size 300x45 [bgcolor=#292929]
+layer at (16,292) size 12x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (8,25) size 12x15 [color=#FFFFFF]
+layer at (44,292) size 16x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (36,24) size 16x16 [color=#FFFFFF]
+layer at (185,291) size 93x17
+ RenderFlexibleBox {DIV} at (177,24) size 93x17
+layer at (187,291) size 89x17
+ RenderFlexibleBox {DIV} at (2,0) size 89x17
+layer at (286,287) size 14x25
+ RenderFlexibleBox {DIV} at (278,20) size 14x25
+layer at (286,292) size 14x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (0,5) size 14x15 [color=#FFFFFF]
layer at (308,133) size 200x25
RenderFlexibleBox {DIV} at (0,0) size 200x25
layer at (308,133) size 200x25
RenderFlexibleBox {DIV} at (0,0) size 200x25
-layer at (314,138) size 16x16
- RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
-layer at (340,138) size 16x16
- RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
-layer at (445,142) size 63x9
- RenderFlexibleBox {DIV} at (136,8) size 64x10
-layer at (447,142) size 60x9
- RenderFlexibleBox {DIV} at (2,0) size 60x9
-layer at (8,162) size 300x150
- RenderFlexibleBox {DIV} at (0,0) size 300x150
-layer at (8,287) size 300x25
- RenderFlexibleBox {DIV} at (0,125) size 300x25
-layer at (14,292) size 16x16
- RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
-layer at (40,292) size 16x16
- RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
-layer at (195,296) size 113x9
- RenderFlexibleBox {DIV} at (186,8) size 114x10
-layer at (197,296) size 110x9
- RenderFlexibleBox {DIV} at (2,0) size 110x9
+layer at (308,133) size 200x25
+ RenderBlock (positioned) {DIV} at (0,0) size 200x25 [bgcolor=#292929]
+layer at (316,138) size 12x15
+ RenderButton {BUTTON} at (8,5) size 12x15 [color=#FFFFFF]
+layer at (344,138) size 16x15
+ RenderButton {BUTTON} at (36,4) size 16x16 [color=#FFFFFF]
+layer at (486,133) size 14x25
+ RenderFlexibleBox {DIV} at (178,0) size 14x25
+layer at (486,138) size 14x15
+ RenderButton {BUTTON} at (0,5) size 14x15 [color=#FFFFFF]
layer at (308,287) size 200x25
RenderFlexibleBox {DIV} at (0,0) size 200x25
layer at (308,287) size 200x25
RenderFlexibleBox {DIV} at (0,0) size 200x25
-layer at (314,292) size 16x16
- RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
-layer at (340,292) size 16x16
- RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
-layer at (445,296) size 63x9
- RenderFlexibleBox {DIV} at (136,8) size 64x10
-layer at (447,296) size 60x9
- RenderFlexibleBox {DIV} at (2,0) size 60x9
+layer at (308,287) size 200x25
+ RenderBlock (positioned) {DIV} at (0,0) size 200x25 [bgcolor=#292929]
+layer at (316,292) size 12x15
+ RenderButton {BUTTON} at (8,5) size 12x15 [color=#FFFFFF]
+layer at (344,292) size 16x15
+ RenderButton {BUTTON} at (36,4) size 16x16 [color=#FFFFFF]
+layer at (486,287) size 14x25
+ RenderFlexibleBox {DIV} at (178,0) size 14x25
+layer at (486,292) size 14x15
+ RenderButton {BUTTON} at (0,5) size 14x15 [color=#FFFFFF]
Modified: trunk/LayoutTests/platform/mac/media/video-controls-rendering-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/mac/media/video-controls-rendering-expected.txt (198911 => 198912)
--- trunk/LayoutTests/platform/mac/media/video-controls-rendering-expected.txt 2016-03-31 20:39:24 UTC (rev 198911)
+++ trunk/LayoutTests/platform/mac/media/video-controls-rendering-expected.txt 2016-03-31 20:43:41 UTC (rev 198912)
@@ -11,129 +11,126 @@
RenderBlock {DIV} at (0,274) size 769x240
RenderText {#text} at (0,0) size 0x0
RenderBlock {DIV} at (0,514) size 769x0
-layer at (8,42) size 320x240
+layer at (8,42) size 320x240 isolatesBlending
RenderVideo {VIDEO} at (0,0) size 320x240
-layer at (8,282) size 320x240
- RenderVideo {VIDEO} at (0,0) size 320x240
layer at (8,42) size 320x240
RenderFlexibleBox {DIV} at (0,0) size 320x240
-layer at (8,257) size 320x25
- RenderFlexibleBox {DIV} at (0,215) size 320x25
-layer at (14,262) size 16x16
- RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
-layer at (40,262) size 16x16
- RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
-layer at (57,265) size 217x11
- RenderFlexibleBox {DIV} at (49,7) size 217x12
-layer at (57,265) size 45x11
- RenderFlexibleBox {DIV} at (0,0) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (10,0) size 25x11
- RenderText {#text} at (0,0) size 25x11
- text run at (0,0) width 25: "00:00"
-layer at (229,265) size 45x11
- RenderFlexibleBox {DIV} at (172,0) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (8,0) size 29x11
- RenderText {#text} at (0,0) size 29x11
- text run at (0,0) width 29: "-00:06"
-layer at (104,266) size 123x9
- RenderFlexibleBox {DIV} at (47,1) size 123x9
- RenderSlider {INPUT} at (0,0) size 123x9 [color=#909090] [bgcolor=#4A4A4A]
- RenderFlexibleBox {DIV} at (0,0) size 123x9
- RenderBlock {DIV} at (0,1) size 123x7
-layer at (104,267) size 6x6
- RenderBlock {DIV} at (0,0) size 6x6 [bgcolor=#FFFFFF]
-layer at (274,259) size 22x22
- RenderFlexibleBox {DIV} at (266,2) size 22x22
-layer at (274,259) size 2x22
- RenderFlexibleBox {DIV} at (0,0) size 2x22 [border: (1px solid #000000F3)]
- RenderSlider {INPUT} at (-7,6) size 2x10 [color=#909090] [border: (1px solid #000000DF)]
- RenderFlexibleBox {DIV} at (1,1) size 0x8
- RenderBlock {DIV} at (0,0) size 0x8
-layer at (260,266) size 8x8
- RenderBlock {DIV} at (-8,0) size 8x8
-layer at (277,262) size 16x16
- RenderButton {BUTTON} at (3,3) size 16x16 [color=#FFFFFF]
-layer at (305,262) size 16x16
- RenderButton {BUTTON} at (297,5) size 16x16 [color=#FFFFFF]
+layer at (8,237) size 320x45
+ RenderFlexibleBox {DIV} at (0,195) size 320x45
+layer at (8,237) size 320x45 isolatesBlending
+ RenderBlock (positioned) {DIV} at (0,0) size 320x45
+layer at (8,237) size 320x45
+ RenderBlock (positioned) {DIV} at (0,0) size 320x45 [bgcolor=#1E1E1E73]
+layer at (8,237) size 320x45 blendMode: lighten
+ RenderBlock (positioned) {DIV} at (0,0) size 320x45 [bgcolor=#292929]
+layer at (16,262) size 12x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (8,25) size 12x15 [color=#FFFFFF]
+layer at (44,262) size 16x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (36,24) size 16x16 [color=#FFFFFF]
+layer at (68,261) size 201x17
+ RenderFlexibleBox {DIV} at (60,24) size 201x17
+layer at (76,263) size 32x13 blendMode: plus-lighter
+ RenderFlexibleBox {DIV} at (8,2) size 32x13 [color=#FFFFFF]
+ RenderBlock (anonymous) at (2,0) size 30x13
+ RenderText {#text} at (0,0) size 30x13
+ text run at (0,0) width 30: "00:00"
+layer at (118,261) size 96x17
+ RenderFlexibleBox {DIV} at (50,0) size 96x17
+layer at (118,261) size 96x17 blendMode: plus-lighter
+ RenderSlider {INPUT} at (0,0) size 96x17 [color=#909090]
+ RenderFlexibleBox {DIV} at (0,0) size 96x17
+ RenderBlock {DIV} at (0,1) size 96x15
+ RenderBlock {DIV} at (0,0) size 3x15
+layer at (224,263) size 37x13 blendMode: plus-lighter
+ RenderFlexibleBox {DIV} at (156,2) size 37x13 [color=#FFFFFF]
+ RenderBlock (anonymous) at (0,0) size 35x13
+ RenderText {#text} at (0,0) size 35x13
+ text run at (0,0) width 35: "-00:06"
+layer at (277,257) size 14x25
+ RenderFlexibleBox {DIV} at (269,20) size 14x25
+layer at (277,262) size 14x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (0,5) size 14x15 [color=#FFFFFF]
+layer at (307,262) size 14x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (299,25) size 14x15 [color=#FFFFFF]
+layer at (8,282) size 320x240 isolatesBlending
+ RenderVideo {VIDEO} at (0,0) size 320x240
layer at (8,282) size 320x240
RenderFlexibleBox {DIV} at (0,0) size 320x240
-layer at (8,497) size 320x25
- RenderFlexibleBox {DIV} at (0,215) size 320x25
-layer at (14,502) size 16x16
- RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
-layer at (40,502) size 16x16
- RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
-layer at (57,505) size 217x11
- RenderFlexibleBox {DIV} at (49,7) size 217x12
-layer at (57,505) size 45x11
- RenderFlexibleBox {DIV} at (0,0) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (10,0) size 25x11
- RenderText {#text} at (0,0) size 25x11
- text run at (0,0) width 25: "00:00"
-layer at (229,505) size 45x11
- RenderFlexibleBox {DIV} at (172,0) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (8,0) size 29x11
- RenderText {#text} at (0,0) size 29x11
- text run at (0,0) width 29: "-00:06"
-layer at (104,506) size 123x9
- RenderFlexibleBox {DIV} at (47,1) size 123x9
- RenderSlider {INPUT} at (0,0) size 123x9 [color=#909090] [bgcolor=#4A4A4A]
- RenderFlexibleBox {DIV} at (0,0) size 123x9
- RenderBlock {DIV} at (0,1) size 123x7
-layer at (104,507) size 6x6
- RenderBlock {DIV} at (0,0) size 6x6 [bgcolor=#FFFFFF]
-layer at (274,499) size 22x22
- RenderFlexibleBox {DIV} at (266,2) size 22x22
-layer at (274,499) size 2x22
- RenderFlexibleBox {DIV} at (0,0) size 2x22 [border: (1px solid #000000F3)]
- RenderSlider {INPUT} at (-7,6) size 2x10 [color=#909090] [border: (1px solid #000000DF)]
- RenderFlexibleBox {DIV} at (1,1) size 0x8
- RenderBlock {DIV} at (0,0) size 0x8
-layer at (260,506) size 8x8
- RenderBlock {DIV} at (-8,0) size 8x8
-layer at (277,502) size 16x16
- RenderButton {BUTTON} at (3,3) size 16x16 [color=#FFFFFF]
-layer at (305,502) size 16x16
- RenderButton {BUTTON} at (297,5) size 16x16 [color=#FFFFFF]
-layer at (8,522) size 320x240
+layer at (8,477) size 320x45
+ RenderFlexibleBox {DIV} at (0,195) size 320x45
+layer at (8,477) size 320x45 isolatesBlending
+ RenderBlock (positioned) {DIV} at (0,0) size 320x45
+layer at (8,477) size 320x45
+ RenderBlock (positioned) {DIV} at (0,0) size 320x45 [bgcolor=#1E1E1E73]
+layer at (8,477) size 320x45 blendMode: lighten
+ RenderBlock (positioned) {DIV} at (0,0) size 320x45 [bgcolor=#292929]
+layer at (16,502) size 12x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (8,25) size 12x15 [color=#FFFFFF]
+layer at (44,502) size 16x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (36,24) size 16x16 [color=#FFFFFF]
+layer at (68,501) size 201x17
+ RenderFlexibleBox {DIV} at (60,24) size 201x17
+layer at (76,503) size 32x13 blendMode: plus-lighter
+ RenderFlexibleBox {DIV} at (8,2) size 32x13 [color=#FFFFFF]
+ RenderBlock (anonymous) at (2,0) size 30x13
+ RenderText {#text} at (0,0) size 30x13
+ text run at (0,0) width 30: "00:00"
+layer at (118,501) size 96x17
+ RenderFlexibleBox {DIV} at (50,0) size 96x17
+layer at (118,501) size 96x17 blendMode: plus-lighter
+ RenderSlider {INPUT} at (0,0) size 96x17 [color=#909090]
+ RenderFlexibleBox {DIV} at (0,0) size 96x17
+ RenderBlock {DIV} at (0,1) size 96x15
+ RenderBlock {DIV} at (0,0) size 3x15
+layer at (224,503) size 37x13 blendMode: plus-lighter
+ RenderFlexibleBox {DIV} at (156,2) size 37x13 [color=#FFFFFF]
+ RenderBlock (anonymous) at (0,0) size 35x13
+ RenderText {#text} at (0,0) size 35x13
+ text run at (0,0) width 35: "-00:06"
+layer at (277,497) size 14x25
+ RenderFlexibleBox {DIV} at (269,20) size 14x25
+layer at (277,502) size 14x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (0,5) size 14x15 [color=#FFFFFF]
+layer at (307,502) size 14x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (299,25) size 14x15 [color=#FFFFFF]
+layer at (8,522) size 320x240 isolatesBlending
RenderVideo {VIDEO} at (8,522) size 320x240
layer at (8,522) size 320x240
RenderFlexibleBox {DIV} at (0,0) size 320x240
-layer at (8,737) size 320x25
- RenderFlexibleBox {DIV} at (0,215) size 320x25
-layer at (14,742) size 16x16
- RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
-layer at (40,742) size 16x16
- RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
-layer at (57,745) size 217x11
- RenderFlexibleBox {DIV} at (49,7) size 217x12
-layer at (57,745) size 45x11
- RenderFlexibleBox {DIV} at (0,0) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (10,0) size 25x11
- RenderText {#text} at (0,0) size 25x11
- text run at (0,0) width 25: "00:00"
-layer at (229,745) size 45x11
- RenderFlexibleBox {DIV} at (172,0) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (8,0) size 29x11
- RenderText {#text} at (0,0) size 29x11
- text run at (0,0) width 29: "-00:06"
-layer at (104,746) size 123x9
- RenderFlexibleBox {DIV} at (47,1) size 123x9
- RenderSlider {INPUT} at (0,0) size 123x9 [color=#909090] [bgcolor=#4A4A4A]
- RenderFlexibleBox {DIV} at (0,0) size 123x9
- RenderBlock {DIV} at (0,1) size 123x7
-layer at (104,747) size 6x6
- RenderBlock {DIV} at (0,0) size 6x6 [bgcolor=#FFFFFF]
-layer at (274,739) size 22x22
- RenderFlexibleBox {DIV} at (266,2) size 22x22
-layer at (274,739) size 2x22
- RenderFlexibleBox {DIV} at (0,0) size 2x22 [border: (1px solid #000000F3)]
- RenderSlider {INPUT} at (-7,6) size 2x10 [color=#909090] [border: (1px solid #000000DF)]
- RenderFlexibleBox {DIV} at (1,1) size 0x8
- RenderBlock {DIV} at (0,0) size 0x8
-layer at (260,746) size 8x8
- RenderBlock {DIV} at (-8,0) size 8x8
-layer at (277,742) size 16x16
- RenderButton {BUTTON} at (3,3) size 16x16 [color=#FFFFFF]
-layer at (305,742) size 16x16
- RenderButton {BUTTON} at (297,5) size 16x16 [color=#FFFFFF]
+layer at (8,717) size 320x45
+ RenderFlexibleBox {DIV} at (0,195) size 320x45
+layer at (8,717) size 320x45 isolatesBlending
+ RenderBlock (positioned) {DIV} at (0,0) size 320x45
+layer at (8,717) size 320x45
+ RenderBlock (positioned) {DIV} at (0,0) size 320x45 [bgcolor=#1E1E1E73]
+layer at (8,717) size 320x45 blendMode: lighten
+ RenderBlock (positioned) {DIV} at (0,0) size 320x45 [bgcolor=#292929]
+layer at (16,742) size 12x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (8,25) size 12x15 [color=#FFFFFF]
+layer at (44,742) size 16x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (36,24) size 16x16 [color=#FFFFFF]
+layer at (68,741) size 201x17
+ RenderFlexibleBox {DIV} at (60,24) size 201x17
+layer at (76,743) size 32x13 blendMode: plus-lighter
+ RenderFlexibleBox {DIV} at (8,2) size 32x13 [color=#FFFFFF]
+ RenderBlock (anonymous) at (2,0) size 30x13
+ RenderText {#text} at (0,0) size 30x13
+ text run at (0,0) width 30: "00:00"
+layer at (118,741) size 96x17
+ RenderFlexibleBox {DIV} at (50,0) size 96x17
+layer at (118,741) size 96x17 blendMode: plus-lighter
+ RenderSlider {INPUT} at (0,0) size 96x17 [color=#909090]
+ RenderFlexibleBox {DIV} at (0,0) size 96x17
+ RenderBlock {DIV} at (0,1) size 96x15
+ RenderBlock {DIV} at (0,0) size 3x15
+layer at (224,743) size 37x13 blendMode: plus-lighter
+ RenderFlexibleBox {DIV} at (156,2) size 37x13 [color=#FFFFFF]
+ RenderBlock (anonymous) at (0,0) size 35x13
+ RenderText {#text} at (0,0) size 35x13
+ text run at (0,0) width 35: "-00:06"
+layer at (277,737) size 14x25
+ RenderFlexibleBox {DIV} at (269,20) size 14x25
+layer at (277,742) size 14x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (0,5) size 14x15 [color=#FFFFFF]
+layer at (307,742) size 14x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (299,25) size 14x15 [color=#FFFFFF]
Modified: trunk/LayoutTests/platform/mac/media/video-display-toggle-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/mac/media/video-display-toggle-expected.txt (198911 => 198912)
--- trunk/LayoutTests/platform/mac/media/video-display-toggle-expected.txt 2016-03-31 20:39:24 UTC (rev 198911)
+++ trunk/LayoutTests/platform/mac/media/video-display-toggle-expected.txt 2016-03-31 20:43:41 UTC (rev 198912)
@@ -7,45 +7,44 @@
text run at (0,0) width 504: "This tests that toggling the display property won't make the controls disappear."
RenderBR {BR} at (503,14) size 1x0
RenderText {#text} at (0,0) size 0x0
-layer at (8,26) size 320x240
+layer at (8,26) size 320x240 isolatesBlending
RenderVideo {VIDEO} at (0,18) size 320x240
layer at (8,26) size 320x240
RenderFlexibleBox {DIV} at (0,0) size 320x240
-layer at (8,241) size 320x25
- RenderFlexibleBox {DIV} at (0,215) size 320x25
-layer at (14,246) size 16x16
- RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
-layer at (40,246) size 16x16
- RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
-layer at (57,249) size 217x11
- RenderFlexibleBox {DIV} at (49,7) size 217x12
-layer at (57,249) size 45x11
- RenderFlexibleBox {DIV} at (0,0) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (10,0) size 25x11
- RenderText {#text} at (0,0) size 25x11
- text run at (0,0) width 25: "00:00"
-layer at (229,249) size 45x11
- RenderFlexibleBox {DIV} at (172,0) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (8,0) size 29x11
- RenderText {#text} at (0,0) size 29x11
- text run at (0,0) width 29: "-00:06"
-layer at (104,250) size 123x9
- RenderFlexibleBox {DIV} at (47,1) size 123x9
- RenderSlider {INPUT} at (0,0) size 123x9 [color=#909090] [bgcolor=#4A4A4A]
- RenderFlexibleBox {DIV} at (0,0) size 123x9
- RenderBlock {DIV} at (0,1) size 123x7
-layer at (104,251) size 6x6
- RenderBlock {DIV} at (0,0) size 6x6 [bgcolor=#FFFFFF]
-layer at (274,243) size 22x22
- RenderFlexibleBox {DIV} at (266,2) size 22x22
-layer at (274,243) size 2x22
- RenderFlexibleBox {DIV} at (0,0) size 2x22 [border: (1px solid #000000F3)]
- RenderSlider {INPUT} at (-7,6) size 2x10 [color=#909090] [border: (1px solid #000000DF)]
- RenderFlexibleBox {DIV} at (1,1) size 0x8
- RenderBlock {DIV} at (0,0) size 0x8
-layer at (260,250) size 8x8
- RenderBlock {DIV} at (-8,0) size 8x8
-layer at (277,246) size 16x16
- RenderButton {BUTTON} at (3,3) size 16x16 [color=#FFFFFF]
-layer at (305,246) size 16x16
- RenderButton {BUTTON} at (297,5) size 16x16 [color=#FFFFFF]
+layer at (8,221) size 320x45
+ RenderFlexibleBox {DIV} at (0,195) size 320x45
+layer at (8,221) size 320x45 isolatesBlending
+ RenderBlock (positioned) {DIV} at (0,0) size 320x45
+layer at (8,221) size 320x45
+ RenderBlock (positioned) {DIV} at (0,0) size 320x45 [bgcolor=#1E1E1E73]
+layer at (8,221) size 320x45 blendMode: lighten
+ RenderBlock (positioned) {DIV} at (0,0) size 320x45 [bgcolor=#292929]
+layer at (16,246) size 12x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (8,25) size 12x15 [color=#FFFFFF]
+layer at (44,246) size 16x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (36,24) size 16x16 [color=#FFFFFF]
+layer at (68,245) size 201x17
+ RenderFlexibleBox {DIV} at (60,24) size 201x17
+layer at (76,247) size 32x13 blendMode: plus-lighter
+ RenderFlexibleBox {DIV} at (8,2) size 32x13 [color=#FFFFFF]
+ RenderBlock (anonymous) at (2,0) size 30x13
+ RenderText {#text} at (0,0) size 30x13
+ text run at (0,0) width 30: "00:00"
+layer at (118,245) size 96x17
+ RenderFlexibleBox {DIV} at (50,0) size 96x17
+layer at (118,245) size 96x17 blendMode: plus-lighter
+ RenderSlider {INPUT} at (0,0) size 96x17 [color=#909090]
+ RenderFlexibleBox {DIV} at (0,0) size 96x17
+ RenderBlock {DIV} at (0,1) size 96x15
+ RenderBlock {DIV} at (0,0) size 3x15
+layer at (224,247) size 37x13 blendMode: plus-lighter
+ RenderFlexibleBox {DIV} at (156,2) size 37x13 [color=#FFFFFF]
+ RenderBlock (anonymous) at (0,0) size 35x13
+ RenderText {#text} at (0,0) size 35x13
+ text run at (0,0) width 35: "-00:06"
+layer at (277,241) size 14x25
+ RenderFlexibleBox {DIV} at (269,20) size 14x25
+layer at (277,246) size 14x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (0,5) size 14x15 [color=#FFFFFF]
+layer at (307,246) size 14x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (299,25) size 14x15 [color=#FFFFFF]
Modified: trunk/LayoutTests/platform/mac/media/video-empty-source-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/mac/media/video-empty-source-expected.txt (198911 => 198912)
--- trunk/LayoutTests/platform/mac/media/video-empty-source-expected.txt 2016-03-31 20:39:24 UTC (rev 198911)
+++ trunk/LayoutTests/platform/mac/media/video-empty-source-expected.txt 2016-03-31 20:43:41 UTC (rev 198912)
@@ -8,21 +8,31 @@
text run at (0,0) width 437: "Slider drawing with no source. The controls should render correctly."
RenderBlock (anonymous) at (0,34) size 784x152
RenderText {#text} at (0,0) size 0x0
-layer at (8,42) size 302x152
+layer at (8,42) size 302x152 isolatesBlending
RenderVideo {VIDEO} at (0,0) size 302x152 [border: (1px solid #000000)]
layer at (9,43) size 300x150
RenderFlexibleBox {DIV} at (1,1) size 300x150
-layer at (9,168) size 300x25
- RenderFlexibleBox {DIV} at (0,125) size 300x25
-layer at (58,169) size 138x25
- RenderBlock {DIV} at (49,0) size 138x26 [color=#FFFFFF]
- RenderText {#text} at (12,7) size 22x11
- text run at (12,7) width 22: "Error"
-layer at (15,173) size 16x16
- RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
-layer at (41,173) size 16x16
- RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
-layer at (196,177) size 113x9
- RenderFlexibleBox {DIV} at (186,8) size 114x10
-layer at (198,177) size 110x9
- RenderFlexibleBox {DIV} at (2,0) size 110x9
+layer at (9,148) size 300x45
+ RenderFlexibleBox {DIV} at (0,105) size 300x45
+layer at (9,148) size 300x45 isolatesBlending
+ RenderBlock (positioned) {DIV} at (0,0) size 300x45
+layer at (9,148) size 300x45
+ RenderBlock (positioned) {DIV} at (0,0) size 300x45 [bgcolor=#1E1E1E73]
+layer at (9,148) size 300x45 blendMode: lighten
+ RenderBlock (positioned) {DIV} at (0,0) size 300x45 [bgcolor=#292929]
+layer at (17,173) size 12x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (8,25) size 12x15 [color=#FFFFFF]
+layer at (45,173) size 16x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (36,24) size 16x16 [color=#FFFFFF]
+layer at (69,168) size 117x25 blendMode: plus-lighter
+ RenderBlock {DIV} at (60,20) size 117x25 [color=#FFFFFF]
+ RenderText {#text} at (12,6) size 26x13
+ text run at (12,6) width 26: "Error"
+layer at (186,172) size 93x17
+ RenderFlexibleBox {DIV} at (177,24) size 93x17
+layer at (188,172) size 89x17
+ RenderFlexibleBox {DIV} at (2,0) size 89x17
+layer at (287,168) size 14x25
+ RenderFlexibleBox {DIV} at (278,20) size 14x25
+layer at (287,173) size 14x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (0,5) size 14x15 [color=#FFFFFF]
Modified: trunk/LayoutTests/platform/mac/media/video-no-audio-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/mac/media/video-no-audio-expected.txt (198911 => 198912)
--- trunk/LayoutTests/platform/mac/media/video-no-audio-expected.txt 2016-03-31 20:39:24 UTC (rev 198911)
+++ trunk/LayoutTests/platform/mac/media/video-no-audio-expected.txt 2016-03-31 20:43:41 UTC (rev 198912)
@@ -8,34 +8,44 @@
text run at (0,0) width 419: "Movie with no audio track. The volume button should not render."
RenderBlock (anonymous) at (0,34) size 784x288
RenderText {#text} at (0,0) size 0x0
-layer at (8,42) size 352x288
+layer at (8,42) size 352x288 isolatesBlending
RenderVideo {VIDEO} at (0,0) size 352x288
layer at (8,42) size 352x288
RenderFlexibleBox {DIV} at (0,0) size 352x288
-layer at (8,305) size 352x25
- RenderFlexibleBox {DIV} at (0,263) size 352x25
-layer at (14,310) size 16x16
- RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
-layer at (40,310) size 16x16
- RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
-layer at (57,313) size 273x11
- RenderFlexibleBox {DIV} at (49,7) size 273x12
-layer at (57,313) size 45x11
- RenderFlexibleBox {DIV} at (0,0) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (10,0) size 25x11
- RenderText {#text} at (0,0) size 25x11
- text run at (0,0) width 25: "00:00"
-layer at (285,313) size 45x11
- RenderFlexibleBox {DIV} at (228,0) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (8,0) size 29x11
- RenderText {#text} at (0,0) size 29x11
- text run at (0,0) width 29: "-00:09"
-layer at (104,314) size 179x9
- RenderFlexibleBox {DIV} at (47,1) size 179x9
- RenderSlider {INPUT} at (0,0) size 179x9 [color=#909090] [bgcolor=#4A4A4A]
- RenderFlexibleBox {DIV} at (0,0) size 179x9
- RenderBlock {DIV} at (0,1) size 179x7
-layer at (104,315) size 6x6
- RenderBlock {DIV} at (0,0) size 6x6 [bgcolor=#FFFFFF]
-layer at (337,310) size 16x16
- RenderButton {BUTTON} at (329,5) size 16x16 [color=#FFFFFF]
+layer at (8,285) size 352x45
+ RenderFlexibleBox {DIV} at (0,243) size 352x45
+layer at (8,285) size 352x45 isolatesBlending
+ RenderBlock (positioned) {DIV} at (0,0) size 352x45
+layer at (8,285) size 352x45
+ RenderBlock (positioned) {DIV} at (0,0) size 352x45 [bgcolor=#1E1E1E73]
+layer at (8,285) size 352x45 blendMode: lighten
+ RenderBlock (positioned) {DIV} at (0,0) size 352x45 [bgcolor=#292929]
+layer at (16,310) size 12x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (8,25) size 12x15 [color=#FFFFFF]
+layer at (44,310) size 16x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (36,24) size 16x16 [color=#FFFFFF]
+layer at (68,309) size 233x17
+ RenderFlexibleBox {DIV} at (60,24) size 233x17
+layer at (76,311) size 32x13 blendMode: plus-lighter
+ RenderFlexibleBox {DIV} at (8,2) size 32x13 [color=#FFFFFF]
+ RenderBlock (anonymous) at (2,0) size 30x13
+ RenderText {#text} at (0,0) size 30x13
+ text run at (0,0) width 30: "00:00"
+layer at (118,309) size 128x17
+ RenderFlexibleBox {DIV} at (50,0) size 128x17
+layer at (118,309) size 128x17 blendMode: plus-lighter
+ RenderSlider {INPUT} at (0,0) size 128x17 [color=#909090]
+ RenderFlexibleBox {DIV} at (0,0) size 128x17
+ RenderBlock {DIV} at (0,1) size 128x15
+ RenderBlock {DIV} at (0,0) size 3x15
+layer at (256,311) size 37x13 blendMode: plus-lighter
+ RenderFlexibleBox {DIV} at (188,2) size 37x13 [color=#FFFFFF]
+ RenderBlock (anonymous) at (0,0) size 35x13
+ RenderText {#text} at (0,0) size 35x13
+ text run at (0,0) width 35: "-00:09"
+layer at (309,305) size 14x25
+ RenderFlexibleBox {DIV} at (301,20) size 14x25
+layer at (309,310) size 14x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (0,5) size 14x15 [color=#FFFFFF]
+layer at (339,310) size 14x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (331,25) size 14x15 [color=#FFFFFF]
Modified: trunk/LayoutTests/platform/mac/media/video-volume-slider-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/mac/media/video-volume-slider-expected.txt (198911 => 198912)
--- trunk/LayoutTests/platform/mac/media/video-volume-slider-expected.txt 2016-03-31 20:39:24 UTC (rev 198911)
+++ trunk/LayoutTests/platform/mac/media/video-volume-slider-expected.txt 2016-03-31 20:43:41 UTC (rev 198912)
@@ -13,45 +13,55 @@
text run at (0,36) width 276: "video element will show the volume slider."
RenderBR {BR} at (275,50) size 1x0
RenderText {#text} at (0,0) size 0x0
-layer at (8,62) size 320x240
+layer at (8,62) size 320x240 isolatesBlending
RenderVideo {VIDEO} at (0,54) size 320x240
layer at (8,62) size 320x240
RenderFlexibleBox {DIV} at (0,0) size 320x240
-layer at (8,277) size 320x25
- RenderFlexibleBox {DIV} at (0,215) size 320x25
-layer at (14,282) size 16x16
- RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
-layer at (40,282) size 16x16
- RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
-layer at (57,285) size 217x11
- RenderFlexibleBox {DIV} at (49,7) size 217x12
-layer at (57,285) size 45x11
- RenderFlexibleBox {DIV} at (0,0) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (10,0) size 25x11
- RenderText {#text} at (0,0) size 25x11
- text run at (0,0) width 25: "00:00"
-layer at (229,285) size 45x11
- RenderFlexibleBox {DIV} at (172,0) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (8,0) size 29x11
- RenderText {#text} at (0,0) size 29x11
- text run at (0,0) width 29: "-00:06"
-layer at (104,286) size 123x9
- RenderFlexibleBox {DIV} at (47,1) size 123x9
- RenderSlider {INPUT} at (0,0) size 123x9 [color=#909090] [bgcolor=#4A4A4A]
- RenderFlexibleBox {DIV} at (0,0) size 123x9
- RenderBlock {DIV} at (0,1) size 123x7
-layer at (104,287) size 6x6
- RenderBlock {DIV} at (0,0) size 6x6 [bgcolor=#FFFFFF]
-layer at (274,279) size 22x22
- RenderFlexibleBox {DIV} at (266,2) size 22x22
-layer at (274,279) size 114x22
- RenderFlexibleBox {DIV} at (0,0) size 114x22 [border: (1px solid #000000F3)]
- RenderSlider {INPUT} at (27,6) size 80x10 [color=#909090] [border: (1px solid #000000DF)]
- RenderFlexibleBox {DIV} at (1,1) size 78x8
- RenderBlock {DIV} at (0,0) size 78x8
-layer at (351,286) size 8x8
- RenderBlock {DIV} at (49,0) size 8x8
-layer at (277,282) size 16x16
- RenderButton {BUTTON} at (3,3) size 16x16 [color=#FFFFFF]
-layer at (305,282) size 16x16
- RenderButton {BUTTON} at (297,5) size 16x16 [color=#FFFFFF]
+layer at (8,257) size 320x45
+ RenderFlexibleBox {DIV} at (0,195) size 320x45
+layer at (8,257) size 320x45 isolatesBlending
+ RenderBlock (positioned) {DIV} at (0,0) size 320x45
+layer at (8,257) size 320x45
+ RenderBlock (positioned) {DIV} at (0,0) size 320x45 [bgcolor=#1E1E1E73]
+layer at (8,257) size 320x45 blendMode: lighten
+ RenderBlock (positioned) {DIV} at (0,0) size 320x45 [bgcolor=#292929]
+layer at (16,282) size 12x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (8,25) size 12x15 [color=#FFFFFF]
+layer at (44,282) size 16x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (36,24) size 16x16 [color=#FFFFFF]
+layer at (68,281) size 201x17
+ RenderFlexibleBox {DIV} at (60,24) size 201x17
+layer at (76,283) size 32x13 blendMode: plus-lighter
+ RenderFlexibleBox {DIV} at (8,2) size 32x13 [color=#FFFFFF]
+ RenderBlock (anonymous) at (2,0) size 30x13
+ RenderText {#text} at (0,0) size 30x13
+ text run at (0,0) width 30: "00:00"
+layer at (118,281) size 96x17
+ RenderFlexibleBox {DIV} at (50,0) size 96x17
+layer at (118,281) size 96x17 blendMode: plus-lighter
+ RenderSlider {INPUT} at (0,0) size 96x17 [color=#909090]
+ RenderFlexibleBox {DIV} at (0,0) size 96x17
+ RenderBlock {DIV} at (0,1) size 96x15
+ RenderBlock {DIV} at (0,0) size 3x15
+layer at (224,283) size 37x13 blendMode: plus-lighter
+ RenderFlexibleBox {DIV} at (156,2) size 37x13 [color=#FFFFFF]
+ RenderBlock (anonymous) at (0,0) size 35x13
+ RenderText {#text} at (0,0) size 35x13
+ text run at (0,0) width 35: "-00:06"
+layer at (277,277) size 14x25
+ RenderFlexibleBox {DIV} at (269,20) size 14x25
+layer at (252,181) size 63x116 isolatesBlending
+ RenderFlexibleBox {DIV} at (-25,-96) size 63x116
+layer at (252,181) size 63x116
+ RenderBlock (positioned) {DIV} at (0,0) size 63x116 [bgcolor=#1E1E1E73]
+layer at (252,181) size 63x116 blendMode: lighten
+ RenderBlock (positioned) {DIV} at (0,0) size 63x116 [bgcolor=#292929]
+layer at (251,235) size 64x9 backgroundClip at (252,181) size 63x116 clip at (252,181) size 63x116 blendMode: plus-lighter
+ RenderSlider {INPUT} at (-1,53) size 64x10 [color=#909090]
+ RenderFlexibleBox {DIV} at (0,0) size 64x9
+ RenderBlock {DIV} at (0,1) size 64x7
+ RenderBlock {DIV} at (39,0) size 8x7
+layer at (277,282) size 14x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (0,5) size 14x15 [color=#FFFFFF]
+layer at (307,282) size 14x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (299,25) size 14x15 [color=#FFFFFF]
Modified: trunk/LayoutTests/platform/mac/media/video-zoom-controls-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/mac/media/video-zoom-controls-expected.txt (198911 => 198912)
--- trunk/LayoutTests/platform/mac/media/video-zoom-controls-expected.txt 2016-03-31 20:39:24 UTC (rev 198911)
+++ trunk/LayoutTests/platform/mac/media/video-zoom-controls-expected.txt 2016-03-31 20:43:41 UTC (rev 198912)
@@ -6,77 +6,47 @@
RenderBlock {P} at (0,0) size 776x28
RenderText {#text} at (0,0) size 278x28
text run at (0,0) width 278: "Zoomed video with controls."
-layer at (57,85) size 240x180
+layer at (57,85) size 240x180 isolatesBlending
RenderVideo {VIDEO} at (45,73) size 240x180
layer at (57,85) size 240x180
RenderFlexibleBox {DIV} at (0,0) size 240x180
-layer at (57,228) size 240x37
- RenderFlexibleBox {DIV} at (0,142) size 240x38
-layer at (66,234) size 24x24
- RenderButton {BUTTON} at (9,6) size 24x25 [color=#FFFFFF]
-layer at (105,235) size 24x24
- RenderButton {BUTTON} at (48,7) size 24x25 [color=#FFFFFF]
-layer at (131,239) size 85x17
- RenderFlexibleBox {DIV} at (73,11) size 86x17
-layer at (131,239) size 68x17 backgroundClip at (131,239) size 67x17 clip at (131,239) size 67x17
- RenderFlexibleBox {DIV} at (0,0) size 68x17 [color=#FFFFFF]
- RenderBlock (anonymous) at (15,0) size 38x17
- RenderText {#text} at (0,0) size 37x17
- text run at (0,0) width 37: "00:00"
-layer at (204,239) size 67x17
- RenderFlexibleBox {DIV} at (73,0) size 68x17 [color=#FFFFFF]
- RenderBlock (anonymous) at (12,0) size 43x17
- RenderText {#text} at (0,0) size 43x17
- text run at (0,0) width 43: "-00:06"
-layer at (201,243) size 9x9
- RenderBlock {DIV} at (0,0) size 9x9 [bgcolor=#FFFFFF]
-layer at (216,231) size 33x33
- RenderFlexibleBox {DIV} at (159,3) size 33x33
-layer at (216,231) size 3x33
- RenderFlexibleBox {DIV} at (0,0) size 3x33 [border: (1.50px solid #000000F3)]
- RenderSlider {INPUT} at (-11,9) size 4x15 [color=#909090] [border: (1.50px solid #000000DF)]
- RenderFlexibleBox {DIV} at (1,1) size 0x13
- RenderBlock {DIV} at (0,0) size 0x12
-layer at (195,241) size 12x12
- RenderBlock {DIV} at (-12,0) size 12x12
-layer at (221,235) size 24x24
- RenderButton {BUTTON} at (4,4) size 25x25 [color=#FFFFFF]
-layer at (263,235) size 24x24
- RenderButton {BUTTON} at (205,7) size 25x25 [color=#FFFFFF]
-layer at (57,310) size 240x180
+layer at (57,198) size 240x67
+ RenderFlexibleBox {DIV} at (0,112) size 240x68
+layer at (57,198) size 240x68 isolatesBlending
+ RenderBlock (positioned) {DIV} at (0,0) size 240x68
+layer at (57,198) size 240x68
+ RenderBlock (positioned) {DIV} at (0,0) size 240x68 [bgcolor=#1E1E1E73]
+layer at (57,198) size 240x68 blendMode: lighten
+ RenderBlock (positioned) {DIV} at (0,0) size 240x68 [bgcolor=#292929]
+layer at (69,235) size 18x22 blendMode: plus-lighter
+ RenderButton {BUTTON} at (12,37) size 18x23 [color=#FFFFFF]
+layer at (111,234) size 24x22 blendMode: plus-lighter
+ RenderButton {BUTTON} at (54,36) size 24x24 [color=#FFFFFF]
+layer at (221,228) size 21x38
+ RenderFlexibleBox {DIV} at (163,30) size 22x38
+layer at (221,235) size 21x22 blendMode: plus-lighter
+ RenderButton {BUTTON} at (0,7) size 21x23 [color=#FFFFFF]
+layer at (266,235) size 21x22 blendMode: plus-lighter
+ RenderButton {BUTTON} at (208,37) size 22x23 [color=#FFFFFF]
+layer at (57,310) size 240x180 isolatesBlending
RenderVideo {VIDEO} at (45,298) size 240x180
layer at (57,310) size 240x180
RenderFlexibleBox {DIV} at (0,0) size 240x180
-layer at (57,453) size 240x37
- RenderFlexibleBox {DIV} at (0,142) size 240x38
-layer at (66,459) size 24x24
- RenderButton {BUTTON} at (9,6) size 24x25 [color=#FFFFFF]
-layer at (105,460) size 24x24
- RenderButton {BUTTON} at (48,7) size 24x25 [color=#FFFFFF]
-layer at (131,464) size 85x17
- RenderFlexibleBox {DIV} at (73,11) size 86x17
-layer at (131,464) size 68x17 backgroundClip at (131,464) size 67x17 clip at (131,464) size 67x17
- RenderFlexibleBox {DIV} at (0,0) size 68x17 [color=#FFFFFF]
- RenderBlock (anonymous) at (15,0) size 38x17
- RenderText {#text} at (0,0) size 37x17
- text run at (0,0) width 37: "00:00"
-layer at (204,464) size 67x17
- RenderFlexibleBox {DIV} at (73,0) size 68x17 [color=#FFFFFF]
- RenderBlock (anonymous) at (12,0) size 43x17
- RenderText {#text} at (0,0) size 43x17
- text run at (0,0) width 43: "-00:06"
-layer at (201,468) size 9x9
- RenderBlock {DIV} at (0,0) size 9x9 [bgcolor=#FFFFFF]
-layer at (216,456) size 33x33
- RenderFlexibleBox {DIV} at (159,3) size 33x33
-layer at (216,456) size 3x33
- RenderFlexibleBox {DIV} at (0,0) size 3x33 [border: (1.50px solid #000000F3)]
- RenderSlider {INPUT} at (-11,9) size 4x15 [color=#909090] [border: (1.50px solid #000000DF)]
- RenderFlexibleBox {DIV} at (1,1) size 0x13
- RenderBlock {DIV} at (0,0) size 0x12
-layer at (195,466) size 12x12
- RenderBlock {DIV} at (-12,0) size 12x12
-layer at (221,460) size 24x24
- RenderButton {BUTTON} at (4,4) size 25x25 [color=#FFFFFF]
-layer at (263,460) size 24x24
- RenderButton {BUTTON} at (205,7) size 25x25 [color=#FFFFFF]
+layer at (57,423) size 240x67
+ RenderFlexibleBox {DIV} at (0,112) size 240x68
+layer at (57,423) size 240x68 isolatesBlending
+ RenderBlock (positioned) {DIV} at (0,0) size 240x68
+layer at (57,423) size 240x68
+ RenderBlock (positioned) {DIV} at (0,0) size 240x68 [bgcolor=#1E1E1E73]
+layer at (57,423) size 240x68 blendMode: lighten
+ RenderBlock (positioned) {DIV} at (0,0) size 240x68 [bgcolor=#292929]
+layer at (69,460) size 18x22 blendMode: plus-lighter
+ RenderButton {BUTTON} at (12,37) size 18x23 [color=#FFFFFF]
+layer at (111,459) size 24x22 blendMode: plus-lighter
+ RenderButton {BUTTON} at (54,36) size 24x24 [color=#FFFFFF]
+layer at (221,453) size 21x38
+ RenderFlexibleBox {DIV} at (163,30) size 22x38
+layer at (221,460) size 21x22 blendMode: plus-lighter
+ RenderButton {BUTTON} at (0,7) size 21x23 [color=#FFFFFF]
+layer at (266,460) size 21x22 blendMode: plus-lighter
+ RenderButton {BUTTON} at (208,37) size 22x23 [color=#FFFFFF]
Deleted: trunk/LayoutTests/platform/mac-mavericks/media/audio-controls-rendering-expected.txt (198911 => 198912)
--- trunk/LayoutTests/platform/mac-mavericks/media/audio-controls-rendering-expected.txt 2016-03-31 20:39:24 UTC (rev 198911)
+++ trunk/LayoutTests/platform/mac-mavericks/media/audio-controls-rendering-expected.txt 2016-03-31 20:43:41 UTC (rev 198912)
@@ -1,132 +0,0 @@
-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 784x584
- RenderBlock {P} at (0,0) size 784x18
- RenderText {#text} at (0,0) size 156x18
- text run at (0,0) width 156: "Test controls placement."
- RenderBlock (anonymous) at (0,34) size 784x104
- RenderMedia {AUDIO} at (0,0) size 200x25 [bgcolor=#0000FF]
- RenderBR {BR} at (200,25) size 0x0
- RenderBR {BR} at (0,25) size 0x18
- RenderMedia {AUDIO} at (0,43) size 320x25 [bgcolor=#0000FF]
- RenderBR {BR} at (320,68) size 0x0
- RenderBR {BR} at (0,68) size 0x18
- RenderBR {BR} at (0,86) size 0x18
-layer at (8,42) size 200x25
- RenderFlexibleBox {DIV} at (0,0) size 200x25
-layer at (8,42) size 200x25
- RenderFlexibleBox {DIV} at (0,0) size 200x25
-layer at (14,47) size 16x16
- RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
-layer at (40,47) size 16x16
- RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
-layer at (57,50) size 127x11
- RenderFlexibleBox {DIV} at (49,7) size 127x12
-layer at (57,50) size 45x11
- RenderFlexibleBox {DIV} at (0,0) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (9,0) size 27x11
- RenderText {#text} at (0,0) size 26x11
- text run at (0,0) width 26: "00:00"
-layer at (139,50) size 45x11
- RenderFlexibleBox {DIV} at (82,0) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (7,0) size 31x11
- RenderText {#text} at (0,0) size 31x11
- text run at (0,0) width 31: "-00:07"
-layer at (104,51) size 33x9
- RenderFlexibleBox {DIV} at (47,1) size 33x9
- RenderSlider {INPUT} at (0,0) size 33x9 [color=#909090] [bgcolor=#4A4A4A]
- RenderFlexibleBox {DIV} at (0,0) size 33x9
- RenderBlock {DIV} at (0,1) size 33x7
-layer at (104,52) size 6x6
- RenderBlock {DIV} at (0,0) size 6x6 [bgcolor=#FFFFFF]
-layer at (184,44) size 22x22
- RenderFlexibleBox {DIV} at (176,2) size 22x22
-layer at (184,44) size 2x22
- RenderFlexibleBox {DIV} at (0,0) size 2x22 [border: (1px solid #000000F3)]
- RenderSlider {INPUT} at (-7,6) size 2x10 [color=#909090] [border: (1px solid #000000DF)]
- RenderFlexibleBox {DIV} at (1,1) size 0x8
- RenderBlock {DIV} at (0,0) size 0x8
-layer at (170,51) size 8x8
- RenderBlock {DIV} at (-8,0) size 8x8
-layer at (187,47) size 16x16
- RenderButton {BUTTON} at (3,3) size 16x16 [color=#FFFFFF]
-layer at (8,85) size 320x25
- RenderFlexibleBox {DIV} at (0,0) size 320x25
-layer at (8,85) size 320x25
- RenderFlexibleBox {DIV} at (0,0) size 320x25
-layer at (14,90) size 16x16
- RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
-layer at (40,90) size 16x16
- RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
-layer at (57,93) size 247x11
- RenderFlexibleBox {DIV} at (49,7) size 247x12
-layer at (57,93) size 45x11
- RenderFlexibleBox {DIV} at (0,0) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (9,0) size 27x11
- RenderText {#text} at (0,0) size 26x11
- text run at (0,0) width 26: "00:00"
-layer at (259,93) size 45x11
- RenderFlexibleBox {DIV} at (202,0) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (7,0) size 31x11
- RenderText {#text} at (0,0) size 31x11
- text run at (0,0) width 31: "-00:07"
-layer at (104,94) size 153x9
- RenderFlexibleBox {DIV} at (47,1) size 153x9
- RenderSlider {INPUT} at (0,0) size 153x9 [color=#909090] [bgcolor=#4A4A4A]
- RenderFlexibleBox {DIV} at (0,0) size 153x9
- RenderBlock {DIV} at (0,1) size 153x7
-layer at (104,95) size 6x6
- RenderBlock {DIV} at (0,0) size 6x6 [bgcolor=#FFFFFF]
-layer at (304,87) size 22x22
- RenderFlexibleBox {DIV} at (296,2) size 22x22
-layer at (304,87) size 2x22
- RenderFlexibleBox {DIV} at (0,0) size 2x22 [border: (1px solid #000000F3)]
- RenderSlider {INPUT} at (-7,6) size 2x10 [color=#909090] [border: (1px solid #000000DF)]
- RenderFlexibleBox {DIV} at (1,1) size 0x8
- RenderBlock {DIV} at (0,0) size 0x8
-layer at (290,94) size 8x8
- RenderBlock {DIV} at (-8,0) size 8x8
-layer at (307,90) size 16x16
- RenderButton {BUTTON} at (3,3) size 16x16 [color=#FFFFFF]
-layer at (8,128) size 320x100
- RenderMedia {AUDIO} at (8,128) size 320x100 [bgcolor=#0000FF]
-layer at (8,128) size 320x100
- RenderFlexibleBox {DIV} at (0,0) size 320x100
-layer at (8,203) size 320x25
- RenderFlexibleBox {DIV} at (0,75) size 320x25
-layer at (14,208) size 16x16
- RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
-layer at (40,208) size 16x16
- RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
-layer at (57,211) size 247x11
- RenderFlexibleBox {DIV} at (49,7) size 247x12
-layer at (57,211) size 45x11
- RenderFlexibleBox {DIV} at (0,0) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (9,0) size 27x11
- RenderText {#text} at (0,0) size 26x11
- text run at (0,0) width 26: "00:00"
-layer at (259,211) size 45x11
- RenderFlexibleBox {DIV} at (202,0) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (7,0) size 31x11
- RenderText {#text} at (0,0) size 31x11
- text run at (0,0) width 31: "-00:07"
-layer at (104,212) size 153x9
- RenderFlexibleBox {DIV} at (47,1) size 153x9
- RenderSlider {INPUT} at (0,0) size 153x9 [color=#909090] [bgcolor=#4A4A4A]
- RenderFlexibleBox {DIV} at (0,0) size 153x9
- RenderBlock {DIV} at (0,1) size 153x7
-layer at (104,213) size 6x6
- RenderBlock {DIV} at (0,0) size 6x6 [bgcolor=#FFFFFF]
-layer at (304,205) size 22x22
- RenderFlexibleBox {DIV} at (296,2) size 22x22
-layer at (304,205) size 2x22
- RenderFlexibleBox {DIV} at (0,0) size 2x22 [border: (1px solid #000000F3)]
- RenderSlider {INPUT} at (-7,6) size 2x10 [color=#909090] [border: (1px solid #000000DF)]
- RenderFlexibleBox {DIV} at (1,1) size 0x8
- RenderBlock {DIV} at (0,0) size 0x8
-layer at (290,212) size 8x8
- RenderBlock {DIV} at (-8,0) size 8x8
-layer at (307,208) size 16x16
- RenderButton {BUTTON} at (3,3) size 16x16 [color=#FFFFFF]
Deleted: trunk/LayoutTests/platform/mac-mavericks/media/video-volume-slider-expected.txt (198911 => 198912)
--- trunk/LayoutTests/platform/mac-mavericks/media/video-volume-slider-expected.txt 2016-03-31 20:39:24 UTC (rev 198911)
+++ trunk/LayoutTests/platform/mac-mavericks/media/video-volume-slider-expected.txt 2016-03-31 20:43:41 UTC (rev 198912)
@@ -1,57 +0,0 @@
-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 784x584
- RenderText {#text} at (0,0) size 443x18
- text run at (0,0) width 443: "Tests if the volume slider is rendererd properly. This test assumes the"
- RenderBR {BR} at (442,14) size 1x0
- RenderText {#text} at (0,18) size 465x18
- text run at (0,18) width 465: "volume slider is implemented and mouse over the right bottom corner of"
- RenderBR {BR} at (464,32) size 1x0
- RenderText {#text} at (0,36) size 276x18
- text run at (0,36) width 276: "video element will show the volume slider."
- RenderBR {BR} at (275,50) size 1x0
- RenderText {#text} at (0,0) size 0x0
-layer at (8,62) size 320x240
- RenderVideo {VIDEO} at (0,54) size 320x240
-layer at (8,62) size 320x240
- RenderFlexibleBox {DIV} at (0,0) size 320x240
-layer at (8,277) size 320x25
- RenderFlexibleBox {DIV} at (0,215) size 320x25
-layer at (14,282) size 16x16
- RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
-layer at (40,282) size 16x16
- RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
-layer at (57,285) size 217x11
- RenderFlexibleBox {DIV} at (49,7) size 217x12
-layer at (57,285) size 45x11
- RenderFlexibleBox {DIV} at (0,0) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (9,0) size 27x11
- RenderText {#text} at (0,0) size 26x11
- text run at (0,0) width 26: "00:00"
-layer at (229,285) size 45x11
- RenderFlexibleBox {DIV} at (172,0) size 45x11 [color=#FFFFFF]
- RenderBlock (anonymous) at (7,0) size 31x11
- RenderText {#text} at (0,0) size 31x11
- text run at (0,0) width 31: "-00:06"
-layer at (104,286) size 123x9
- RenderFlexibleBox {DIV} at (47,1) size 123x9
- RenderSlider {INPUT} at (0,0) size 123x9 [color=#909090] [bgcolor=#4A4A4A]
- RenderFlexibleBox {DIV} at (0,0) size 123x9
- RenderBlock {DIV} at (0,1) size 123x7
-layer at (104,287) size 6x6
- RenderBlock {DIV} at (0,0) size 6x6 [bgcolor=#FFFFFF]
-layer at (274,279) size 22x22
- RenderFlexibleBox {DIV} at (266,2) size 22x22
-layer at (274,279) size 114x22
- RenderFlexibleBox {DIV} at (0,0) size 114x22 [border: (1px solid #000000F3)]
- RenderSlider {INPUT} at (27,6) size 80x10 [color=#909090] [border: (1px solid #000000DF)]
- RenderFlexibleBox {DIV} at (1,1) size 78x8
- RenderBlock {DIV} at (0,0) size 78x8
-layer at (351,286) size 8x8
- RenderBlock {DIV} at (49,0) size 8x8
-layer at (277,282) size 16x16
- RenderButton {BUTTON} at (3,3) size 16x16 [color=#FFFFFF]
-layer at (305,282) size 16x16
- RenderButton {BUTTON} at (297,5) size 16x16 [color=#FFFFFF]
Copied: trunk/LayoutTests/platform/mac-yosemite/http/tests/media/hls/video-controls-live-stream-expected.txt (from rev 198911, trunk/LayoutTests/platform/mac/http/tests/media/hls/video-controls-live-stream-expected.txt) (0 => 198912)
--- trunk/LayoutTests/platform/mac-yosemite/http/tests/media/hls/video-controls-live-stream-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-yosemite/http/tests/media/hls/video-controls-live-stream-expected.txt 2016-03-31 20:43:41 UTC (rev 198912)
@@ -0,0 +1,28 @@
+
+EVENT(canplaythrough)
+EVENT(play)
+EXPECTED (video.duration == 'Infinity') OK
+-webkit-media-text-track-container: classes: [hidden]
+-webkit-media-show-controls: classes: []
+-webkit-media-controls-wireless-playback-status: classes: [hidden]
+-webkit-media-controls-wireless-playback-text: classes: []
+-webkit-media-controls-wireless-playback-text-top: classes: []
+-webkit-media-controls-wireless-playback-text-bottom: classes: []
+-webkit-media-controls-panel: classes: [show paused]
+-webkit-media-controls-panel-background-container: classes: []
+-webkit-media-controls-panel-background: classes: [paused show]
+-webkit-media-controls-panel-tint: classes: []
+-webkit-media-controls-play-button: classes: [paused]
+-webkit-media-controls-status-display: classes: []
+none: classes: [mute-box]
+-webkit-media-controls-volume-slider-container: classes: [volume-box]
+-webkit-media-controls-volume-slider-container-background: classes: []
+-webkit-media-controls-volume-slider-container-tint: classes: []
+-webkit-media-controls-volume-slider: classes: []
+-webkit-media-controls-mute-button: classes: []
+-webkit-media-controls-wireless-playback-picker-button: classes: [hidden]
+-webkit-media-controls-toggle-closed-captions-button: classes: [hidden]
+-webkit-media-controls-fullscreen-button: classes: []
+TEST(timeline == null || timeline.disabled) OK
+END OF TEST
+
Added: trunk/LayoutTests/platform/mac-yosemite/media/controls-styling-expected.txt (0 => 198912)
--- trunk/LayoutTests/platform/mac-yosemite/media/controls-styling-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-yosemite/media/controls-styling-expected.txt 2016-03-31 20:43:41 UTC (rev 198912)
@@ -0,0 +1,94 @@
+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 784x584
+ RenderBlock {P} at (0,0) size 784x18
+ RenderText {#text} at (0,0) size 279x18
+ text run at (0,0) width 279: "The look of the controls should not change."
+ RenderBlock {DIV} at (0,34) size 784x240 [color=#0000FF]
+ RenderText {#text} at (0,0) size 0x0
+ RenderBlock (anonymous) at (0,274) size 784x240
+ RenderText {#text} at (0,0) size 0x0
+layer at (18,42) size 320x240 isolatesBlending
+ RenderVideo {VIDEO} at (10,0) size 320x240
+layer at (18,42) size 320x240
+ RenderFlexibleBox {DIV} at (0,0) size 320x240
+layer at (18,237) size 320x45
+ RenderFlexibleBox {DIV} at (0,195) size 320x45
+layer at (18,237) size 320x45 isolatesBlending
+ RenderBlock (positioned) {DIV} at (0,0) size 320x45
+layer at (18,237) size 320x45
+ RenderBlock (positioned) {DIV} at (0,0) size 320x45 [bgcolor=#1E1E1E73]
+layer at (18,237) size 320x45 blendMode: lighten
+ RenderBlock (positioned) {DIV} at (0,0) size 320x45 [bgcolor=#292929]
+layer at (26,262) size 12x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (8,25) size 12x15 [color=#FFFFFF]
+layer at (54,262) size 16x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (36,24) size 16x16 [color=#FFFFFF]
+layer at (78,261) size 201x17
+ RenderFlexibleBox {DIV} at (60,24) size 201x17
+layer at (86,263) size 32x13 blendMode: plus-lighter
+ RenderFlexibleBox {DIV} at (8,2) size 32x13 [color=#FFFFFF]
+ RenderBlock (anonymous) at (2,0) size 30x13
+ RenderText {#text} at (0,0) size 30x13
+ text run at (0,0) width 30: "00:00"
+layer at (128,261) size 96x17
+ RenderFlexibleBox {DIV} at (50,0) size 96x17
+layer at (128,261) size 96x17 blendMode: plus-lighter
+ RenderSlider {INPUT} at (0,0) size 96x17 [color=#909090]
+ RenderFlexibleBox {DIV} at (0,0) size 96x17
+ RenderBlock {DIV} at (0,1) size 96x15
+ RenderBlock {DIV} at (0,0) size 3x15
+layer at (234,263) size 37x13 blendMode: plus-lighter
+ RenderFlexibleBox {DIV} at (156,2) size 37x13 [color=#FFFFFF]
+ RenderBlock (anonymous) at (0,0) size 35x13
+ RenderText {#text} at (0,0) size 35x13
+ text run at (0,0) width 35: "-00:06"
+layer at (287,257) size 14x25
+ RenderFlexibleBox {DIV} at (269,20) size 14x25
+layer at (287,262) size 14x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (0,5) size 14x15 [color=#FFFFFF]
+layer at (317,262) size 14x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (299,25) size 14x15 [color=#FFFFFF]
+layer at (8,282) size 320x240 isolatesBlending
+ RenderVideo {VIDEO} at (0,0) size 320x240
+layer at (8,282) size 320x240
+ RenderFlexibleBox {DIV} at (0,0) size 320x240
+layer at (8,477) size 320x45
+ RenderFlexibleBox {DIV} at (0,195) size 320x45
+layer at (8,477) size 320x45 isolatesBlending
+ RenderBlock (positioned) {DIV} at (0,0) size 320x45
+layer at (8,477) size 320x45
+ RenderBlock (positioned) {DIV} at (0,0) size 320x45 [bgcolor=#1E1E1E73]
+layer at (8,477) size 320x45 blendMode: lighten
+ RenderBlock (positioned) {DIV} at (0,0) size 320x45 [bgcolor=#292929]
+layer at (16,502) size 12x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (8,25) size 12x15 [color=#FFFFFF]
+layer at (44,502) size 16x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (36,24) size 16x16 [color=#FFFFFF]
+layer at (68,501) size 201x17
+ RenderFlexibleBox {DIV} at (60,24) size 201x17
+layer at (76,503) size 32x13 blendMode: plus-lighter
+ RenderFlexibleBox {DIV} at (8,2) size 32x13 [color=#FFFFFF]
+ RenderBlock (anonymous) at (2,0) size 30x13
+ RenderText {#text} at (0,0) size 30x13
+ text run at (0,0) width 30: "00:00"
+layer at (118,501) size 96x17
+ RenderFlexibleBox {DIV} at (50,0) size 96x17
+layer at (118,501) size 96x17 blendMode: plus-lighter
+ RenderSlider {INPUT} at (0,0) size 96x17 [color=#909090]
+ RenderFlexibleBox {DIV} at (0,0) size 96x17
+ RenderBlock {DIV} at (0,1) size 96x15
+ RenderBlock {DIV} at (0,0) size 3x15
+layer at (224,503) size 37x13 blendMode: plus-lighter
+ RenderFlexibleBox {DIV} at (156,2) size 37x13 [color=#FFFFFF]
+ RenderBlock (anonymous) at (0,0) size 35x13
+ RenderText {#text} at (0,0) size 35x13
+ text run at (0,0) width 35: "-00:06"
+layer at (277,497) size 14x25
+ RenderFlexibleBox {DIV} at (269,20) size 14x25
+layer at (277,502) size 14x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (0,5) size 14x15 [color=#FFFFFF]
+layer at (307,502) size 14x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (299,25) size 14x15 [color=#FFFFFF]
