Diff
Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (198416 => 198417)
--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2016-03-18 15:59:07 UTC (rev 198416)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2016-03-18 16:00:55 UTC (rev 198417)
@@ -1,3 +1,26 @@
+2016-03-18 Babak Shafiei <[email protected]>
+
+ Merge r192252.
+
+ 2015-11-10 Zalan Bujtas <[email protected]>
+
+ Force display: block on ::-webkit-media-controls.
+ https://bugs.webkit.org/show_bug.cgi?id=149178
+ <rdar://problem/23448397>
+
+ Reviewed by Simon Fraser.
+
+ This patch ensures that we always have a block level container for media controls
+ so that continuation never needs to split RenderMedia into multiple subtrees.
+
+ Current inline continuation logic assumes that only inline elements with RenderInline
+ type of renderers participate in continuation. This is mostly the case since other inline renderers
+ such as RenderReplaced, RenderImage, RenderEmbeddedObject etc can't have (accessible) children.
+ (Unlike video::-webkit-media-controls)
+
+ * media/webkit-media-controls-display-expected.txt: Added.
+ * media/webkit-media-controls-display.html: Added.
+
2016-03-14 Matthew Hanson <[email protected]>
Merge r196268. rdar://problem/24748259
Copied: branches/safari-601.1.46-branch/LayoutTests/media/webkit-media-controls-display-expected.txt (from rev 198404, branches/safari-601-branch/LayoutTests/media/webkit-media-controls-display-expected.txt) (0 => 198417)
--- branches/safari-601.1.46-branch/LayoutTests/media/webkit-media-controls-display-expected.txt (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/media/webkit-media-controls-display-expected.txt 2016-03-18 16:00:55 UTC (rev 198417)
@@ -0,0 +1,3 @@
+Overloading ::-webkit-media-controls display property. PASS if it doesn't crash.
+
+
Copied: branches/safari-601.1.46-branch/LayoutTests/media/webkit-media-controls-display.html (from rev 198404, branches/safari-601-branch/LayoutTests/media/webkit-media-controls-display.html) (0 => 198417)
--- branches/safari-601.1.46-branch/LayoutTests/media/webkit-media-controls-display.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/media/webkit-media-controls-display.html 2016-03-18 16:00:55 UTC (rev 198417)
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<p>Overloading ::-webkit-media-controls display property. PASS if it doesn't crash.</p>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+var displayValues = ["-webkit-box", "-webkit-flex", "-webkit-inline-box",
+ "-webkit-inline-flex", "block", "flex", "grid", "inline", "inline-block",
+ "inline-flex", "inline-grid", "inline-table", "list-item", "none", "table",
+ "table-caption", "table-cell", "table-column", "table-column-group",
+ "table-footer-group", "table-header-group", "table-row", "table-row-group"];
+
+var styleSheet = "video { width: 200px; height: 30px; }\n";
+
+displayValues.forEach(function(value, idx) {
+ var video = document.createElement("video");
+ video.controls = true;
+ video.id = "video" + idx;
+ document.body.appendChild(video);
+
+ styleSheet += "#video" + idx + "::-webkit-media-controls { display: " + value + " !important; }\n";
+});
+
+var style = document.createElement("style");
+style.textContent = styleSheet;
+document.head.appendChild(style);
+</script>
Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (198416 => 198417)
--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-03-18 15:59:07 UTC (rev 198416)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-03-18 16:00:55 UTC (rev 198417)
@@ -1,5 +1,34 @@
2016-03-18 Babak Shafiei <[email protected]>
+ Merge r192252.
+
+ 2015-11-10 Zalan Bujtas <[email protected]>
+
+ Force display: block on ::-webkit-media-controls.
+ https://bugs.webkit.org/show_bug.cgi?id=149178
+ <rdar://problem/23448397>
+
+ Reviewed by Simon Fraser.
+
+ This patch ensures that we always have a block level container for media controls
+ so that continuation never needs to split RenderMedia into multiple subtrees.
+
+ Current inline continuation logic assumes that only inline elements with RenderInline
+ type of renderers participate in continuation. This is mostly the case since other inline renderers
+ such as RenderReplaced, RenderImage, RenderEmbeddedObject etc can't have (accessible) children.
+ (Unlike video::-webkit-media-controls)
+
+ Test: media/webkit-media-controls-display.html
+
+ * Modules/mediacontrols/mediaControlsApple.css:
+ (::-webkit-media-controls):
+ * Modules/mediacontrols/mediaControlsiOS.css:
+ (::-webkit-media-controls):
+ * css/mediaControls.css:
+ (::-webkit-media-controls):
+
+2016-03-18 Babak Shafiei <[email protected]>
+
Merge r192853.
2015-11-30 Simon Fraser <[email protected]>
Modified: branches/safari-601.1.46-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css (198416 => 198417)
--- branches/safari-601.1.46-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2016-03-18 15:59:07 UTC (rev 198416)
+++ branches/safari-601.1.46-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2016-03-18 16:00:55 UTC (rev 198417)
@@ -52,7 +52,7 @@
width: inherit;
height: inherit;
position: relative;
- display: -webkit-flex;
+ display: -webkit-flex !important;
-webkit-align-items: stretch;
-webkit-justify-content: flex-end;
-webkit-flex-direction: column;
Modified: branches/safari-601.1.46-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css (198416 => 198417)
--- branches/safari-601.1.46-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css 2016-03-18 15:59:07 UTC (rev 198416)
+++ branches/safari-601.1.46-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css 2016-03-18 16:00:55 UTC (rev 198417)
@@ -53,7 +53,7 @@
width: inherit;
height: inherit;
position: relative;
- display: -webkit-flex;
+ display: -webkit-flex !important;
-webkit-align-items: stretch;
-webkit-justify-content: flex-end;
-webkit-flex-direction: column;
Modified: branches/safari-601.1.46-branch/Source/WebCore/css/mediaControls.css (198416 => 198417)
--- branches/safari-601.1.46-branch/Source/WebCore/css/mediaControls.css 2016-03-18 15:59:07 UTC (rev 198416)
+++ branches/safari-601.1.46-branch/Source/WebCore/css/mediaControls.css 2016-03-18 16:00:55 UTC (rev 198417)
@@ -37,7 +37,7 @@
width: inherit;
height: inherit;
position: relative;
- display: -webkit-flex;
+ display: -webkit-flex !important;
-webkit-align-items: flex-start;
-webkit-justify-content: flex-end;
-webkit-flex-direction: column;
