Diff
Modified: trunk/LayoutTests/ChangeLog (199205 => 199206)
--- trunk/LayoutTests/ChangeLog 2016-04-08 00:40:21 UTC (rev 199205)
+++ trunk/LayoutTests/ChangeLog 2016-04-08 01:22:11 UTC (rev 199206)
@@ -1,3 +1,14 @@
+2016-04-07 Ada Chan <[email protected]>
+
+ Roll out the css change in mediaControlsApple.css that has been causing assertions in layout for multiple tests
+ https://bugs.webkit.org/show_bug.cgi?id=156381
+
+ Rubber-stamped by Alexey Proskuryakov.
+
+ * platform/mac/TestExpectations:
+ * platform/mac/media/media-document-audio-repaint-expected.txt:
+ * platform/mac/media/video-zoom-controls-expected.txt:
+
2016-04-07 Jiewen Tan <[email protected]>
Unreviewed, rolling out r199199.
Modified: trunk/LayoutTests/platform/mac/TestExpectations (199205 => 199206)
--- trunk/LayoutTests/platform/mac/TestExpectations 2016-04-08 00:40:21 UTC (rev 199205)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2016-04-08 01:22:11 UTC (rev 199206)
@@ -1322,15 +1322,3 @@
webkit.org/b/156112 [ ElCapitan ] media/controls-without-preload.html [ Pass Failure ]
webkit.org/b/156351 storage/indexeddb/modern/autoincrement-abort-private.html [ Pass Timeout ]
-
-webkit.org/b/156320 fast/regions/inline-block-inside-anonymous-overflow.html [ ImageOnlyFailure ]
-
-# Assertions in FrameView::scheduleRelayoutOfSubtree()
-webkit.org/b/156349 [ Debug ] http/tests/appcache/video.html [ Skip ]
-webkit.org/b/156349 [ Debug ] media/track/track-active-cues.html [ Skip ]
-webkit.org/b/156349 [ Debug ] media/track/track-in-band.html [ Skip ]
-webkit.org/b/156349 [ Debug ] media/track/video-track-alternate-groups.html [ Skip ]
-webkit.org/b/156349 [ Debug ] media/track/video-track.html [ Skip ]
-webkit.org/b/156349 [ Debug ] media/video-src-empty.html [ Skip ]
-webkit.org/b/156349 [ Debug ] media/media-controls-invalid-url.html [ Skip ]
-webkit.org/b/156349 [ Debug ] plugins/quicktime-plugin-replacement.html [ Skip ]
Modified: trunk/LayoutTests/platform/mac/media/media-document-audio-repaint-expected.txt (199205 => 199206)
--- trunk/LayoutTests/platform/mac/media/media-document-audio-repaint-expected.txt 2016-04-08 00:40:21 UTC (rev 199205)
+++ trunk/LayoutTests/platform/mac/media/media-document-audio-repaint-expected.txt 2016-04-08 01:22:11 UTC (rev 199206)
@@ -21,13 +21,38 @@
RenderVideo {VIDEO} at (40,164) size 300x2
layer at (40,165) size 300x1
RenderFlexibleBox {DIV} at (0,0) size 300x1
- layer at (40,121) size 300x45 backgroundClip at (40,165) size 300x1 clip at (40,165) size 300x1
+ layer at (40,121) size 300x45
RenderFlexibleBox {DIV} at (0,-44) size 300x45
- layer at (40,121) size 300x45 backgroundClip at (40,165) size 300x1 clip at (40,165) size 300x1 isolatesBlending
+ layer at (40,121) size 300x45 isolatesBlending
RenderBlock (positioned) {DIV} at (0,0) size 300x45
- layer at (40,121) size 300x45 backgroundClip at (40,165) size 300x1 clip at (40,165) size 300x1
+ layer at (40,121) size 300x45
RenderBlock (positioned) {DIV} at (0,0) size 300x45 [bgcolor=#1E1E1E73]
- layer at (40,121) size 300x45 backgroundClip at (40,165) size 300x1 clip at (40,165) size 300x1 blendMode: lighten
+ layer at (40,121) size 300x45 blendMode: lighten
RenderBlock (positioned) {DIV} at (0,0) size 300x45 [bgcolor=#292929]
- layer at (318,141) size 14x25 backgroundClip at (40,165) size 300x1 clip at (40,165) size 300x1
+ layer at (48,146) size 12x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (8,25) size 12x15 [color=#FFFFFF]
+ layer at (76,145) size 16x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (36,24) size 16x16 [color=#FFFFFF]
+ layer at (100,145) size 210x17
+ RenderFlexibleBox {DIV} at (60,24) size 210x17
+ layer at (108,146) 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 (150,145) size 105x17
+ RenderFlexibleBox {DIV} at (50,0) size 105x17
+ layer at (150,145) size 105x17 blendMode: plus-lighter
+ RenderSlider {INPUT} at (0,0) size 105x17 [color=#909090]
+ RenderFlexibleBox {DIV} at (0,0) size 105x17
+ RenderBlock {DIV} at (0,1) size 105x15
+ RenderBlock {DIV} at (50,0) size 4x15
+ layer at (265,146) size 37x13 blendMode: plus-lighter
+ RenderFlexibleBox {DIV} at (165,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:00"
+ layer at (318,141) size 14x25
RenderFlexibleBox {DIV} at (278,20) size 14x25
+ layer at (318,146) size 14x15 blendMode: plus-lighter
+ RenderButton {BUTTON} at (0,5) size 14x15 [color=#FFFFFF]
Modified: trunk/LayoutTests/platform/mac/media/video-zoom-controls-expected.txt (199205 => 199206)
--- trunk/LayoutTests/platform/mac/media/video-zoom-controls-expected.txt 2016-04-08 00:40:21 UTC (rev 199205)
+++ trunk/LayoutTests/platform/mac/media/video-zoom-controls-expected.txt 2016-04-08 01:22:11 UTC (rev 199206)
@@ -12,17 +12,17 @@
RenderFlexibleBox {DIV} at (0,0) size 240x180
layer at (57,198) size 240x67
RenderFlexibleBox {DIV} at (0,112) size 240x68
-layer at (57,198) size 240x68 backgroundClip at (57,85) size 240x180 clip at (57,85) size 240x180 isolatesBlending
+layer at (57,198) size 240x68 isolatesBlending
RenderBlock (positioned) {DIV} at (0,0) size 240x68
-layer at (57,198) size 240x68 backgroundClip at (57,85) size 240x180 clip at (57,85) size 240x180
+layer at (57,198) size 240x68
RenderBlock (positioned) {DIV} at (0,0) size 240x68 [bgcolor=#1E1E1E73]
-layer at (57,198) size 240x68 backgroundClip at (57,85) size 240x180 clip at (57,85) size 240x180 blendMode: lighten
+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 backgroundClip at (57,85) size 240x180 clip at (57,85) size 240x180
+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]
@@ -32,21 +32,21 @@
RenderVideo {VIDEO} at (45,298) size 240x180
layer at (57,310) size 240x180
RenderFlexibleBox {DIV} at (0,0) size 240x180
-layer at (57,423) size 240x67 backgroundClip at (74,291) size 240x180 clip at (74,291) size 240x180
+layer at (57,423) size 240x67
RenderFlexibleBox {DIV} at (0,112) size 240x68
-layer at (57,423) size 240x68 backgroundClip at (74,291) size 240x180 clip at (74,291) size 240x180 isolatesBlending
+layer at (57,423) size 240x68 isolatesBlending
RenderBlock (positioned) {DIV} at (0,0) size 240x68
-layer at (57,423) size 240x68 backgroundClip at (74,291) size 240x180 clip at (74,291) size 240x180
+layer at (57,423) size 240x68
RenderBlock (positioned) {DIV} at (0,0) size 240x68 [bgcolor=#1E1E1E73]
-layer at (57,423) size 240x68 backgroundClip at (74,291) size 240x180 clip at (74,291) size 240x180 blendMode: lighten
+layer at (57,423) size 240x68 blendMode: lighten
RenderBlock (positioned) {DIV} at (0,0) size 240x68 [bgcolor=#292929]
-layer at (69,460) size 18x22 backgroundClip at (74,291) size 240x180 clip at (74,291) size 240x180 blendMode: plus-lighter
+layer at (69,460) size 18x22 blendMode: plus-lighter
RenderButton {BUTTON} at (12,37) size 18x23 [color=#FFFFFF]
-layer at (111,459) size 24x22 backgroundClip at (74,291) size 240x180 clip at (74,291) size 240x180 blendMode: plus-lighter
+layer at (111,459) size 24x22 blendMode: plus-lighter
RenderButton {BUTTON} at (54,36) size 24x24 [color=#FFFFFF]
-layer at (221,453) size 21x38 backgroundClip at (74,291) size 240x180 clip at (74,291) size 240x180
+layer at (221,453) size 21x38
RenderFlexibleBox {DIV} at (163,30) size 22x38
-layer at (221,460) size 21x22 backgroundClip at (74,291) size 240x180 clip at (74,291) size 240x180 blendMode: plus-lighter
+layer at (221,460) size 21x22 blendMode: plus-lighter
RenderButton {BUTTON} at (0,7) size 21x23 [color=#FFFFFF]
-layer at (266,460) size 21x22 backgroundClip at (74,291) size 240x180 clip at (74,291) size 240x180 blendMode: plus-lighter
+layer at (266,460) size 21x22 blendMode: plus-lighter
RenderButton {BUTTON} at (208,37) size 22x23 [color=#FFFFFF]
Modified: trunk/Source/WebCore/ChangeLog (199205 => 199206)
--- trunk/Source/WebCore/ChangeLog 2016-04-08 00:40:21 UTC (rev 199205)
+++ trunk/Source/WebCore/ChangeLog 2016-04-08 01:22:11 UTC (rev 199206)
@@ -1,3 +1,14 @@
+2016-04-07 Ada Chan <[email protected]>
+
+ Roll out the css change in mediaControlsApple.css that has been causing assertions in layout for multiple tests
+ https://bugs.webkit.org/show_bug.cgi?id=156381
+
+ Rubber-stamped by Alexey Proskuryakov.
+
+ * Modules/mediacontrols/mediaControlsApple.css:
+ (::-webkit-media-controls):
+ Remove overflow: hidden.
+
2016-04-07 Jiewen Tan <[email protected]>
Unreviewed, rolling out r199199.
Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css (199205 => 199206)
--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2016-04-08 00:40:21 UTC (rev 199205)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2016-04-08 01:22:11 UTC (rev 199206)
@@ -59,7 +59,6 @@
font: -webkit-small-control;
white-space: nowrap;
-webkit-font-smoothing: subpixel-antialiased;
- overflow: hidden;
}
video::-webkit-media-text-track-container,