Title: [187066] branches/safari-601.1-branch
- Revision
- 187066
- Author
- [email protected]
- Date
- 2015-07-20 21:37:14 -0700 (Mon, 20 Jul 2015)
Log Message
Merge r186968. rdar://problem/21359811
Modified Paths
Added Paths
Diff
Modified: branches/safari-601.1-branch/LayoutTests/ChangeLog (187065 => 187066)
--- branches/safari-601.1-branch/LayoutTests/ChangeLog 2015-07-21 04:37:11 UTC (rev 187065)
+++ branches/safari-601.1-branch/LayoutTests/ChangeLog 2015-07-21 04:37:14 UTC (rev 187066)
@@ -1,5 +1,19 @@
2015-07-20 Matthew Hanson <[email protected]>
+ Merge r186968. rdar://problem/21359811
+
+ 2015-07-17 Myles C. Maxfield <[email protected]>
+
+ Video posters disappear once media has loaded
+ https://bugs.webkit.org/show_bug.cgi?id=147045
+
+ Reviewed by Simon Fraser.
+
+ * compositing/video/poster-expected.html: Added.
+ * compositing/video/poster.html: Added.
+
+2015-07-20 Matthew Hanson <[email protected]>
+
Merge r186957. rdar://problem/21867831
2015-07-17 Benjamin Poulain <[email protected]>
Added: branches/safari-601.1-branch/LayoutTests/compositing/video/poster-expected.html (0 => 187066)
--- branches/safari-601.1-branch/LayoutTests/compositing/video/poster-expected.html (rev 0)
+++ branches/safari-601.1-branch/LayoutTests/compositing/video/poster-expected.html 2015-07-21 04:37:14 UTC (rev 187066)
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<head>
+<style>
+video {
+ width: 300px;
+ height: 300px;
+}
+video::-webkit-media-controls-fullscreen-button,
+video::-webkit-media-controls-timeline-container,
+video::-webkit-media-controls-mute-button,
+video::-webkit-media-controls-wireless-playback-picker-button {
+ display: none;
+}
+</style>
+</head>
+<body>
+<p>This test makes sure that video posters are displayed even after the source is loaded</p>
+<video controls poster="../resources/simple_image.png"></video>
+</body>
+</html>
Added: branches/safari-601.1-branch/LayoutTests/compositing/video/poster.html (0 => 187066)
--- branches/safari-601.1-branch/LayoutTests/compositing/video/poster.html (rev 0)
+++ branches/safari-601.1-branch/LayoutTests/compositing/video/poster.html 2015-07-21 04:37:14 UTC (rev 187066)
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html>
+<head>
+<style>
+video {
+ width: 300px;
+ height: 300px;
+}
+video::-webkit-media-controls-fullscreen-button,
+video::-webkit-media-controls-timeline-container,
+video::-webkit-media-controls-mute-button,
+video::-webkit-media-controls-wireless-playback-picker-button {
+ display: none;
+}
+</style>
+<script src=""
+</head>
+<body>
+<p>This test makes sure that video posters are displayed even after the source is loaded</p>
+<video controls id="v" poster="../resources/simple_image.png"></video>
+<script>
+var v = document.getElementById("v");
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ v.addEventListener("canplaythrough", function() {
+ testRunner.notifyDone();
+ });
+}
+v.setAttribute("src", findMediaFile("video", "../resources/video"));
+</script>
+</body>
+</html>
Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (187065 => 187066)
--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-21 04:37:11 UTC (rev 187065)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-21 04:37:14 UTC (rev 187066)
@@ -1,5 +1,26 @@
2015-07-20 Matthew Hanson <[email protected]>
+ Merge r186968. rdar://problem/21359811
+
+ 2015-07-17 Myles C. Maxfield <[email protected]>
+
+ Video posters disappear once media has loaded
+ https://bugs.webkit.org/show_bug.cgi?id=147045
+
+ Reviewed by Simon Fraser.
+
+ After r184932, all video elements are composited. However, there is logic in
+ RenderLayerBacking::updateConfiguration() which adds the video layer to the page
+ if the video is composited, without checking first to see if it should actually
+ do so.
+
+ Test: compositing/video/poster.html
+
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::updateConfiguration):
+
+2015-07-20 Matthew Hanson <[email protected]>
+
Merge r186964. rdar://problem/21803781
2015-07-17 Dan Bernstein <[email protected]>
Modified: branches/safari-601.1-branch/Source/WebCore/rendering/RenderLayerBacking.cpp (187065 => 187066)
--- branches/safari-601.1-branch/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-07-21 04:37:11 UTC (rev 187065)
+++ branches/safari-601.1-branch/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-07-21 04:37:14 UTC (rev 187066)
@@ -634,7 +634,7 @@
#endif
}
#if ENABLE(VIDEO)
- else if (renderer().isVideo()) {
+ else if (is<RenderVideo>(renderer()) && downcast<RenderVideo>(renderer()).shouldDisplayVideo()) {
HTMLMediaElement* mediaElement = downcast<HTMLMediaElement>(renderer().element());
m_graphicsLayer->setContentsToPlatformLayer(mediaElement->platformLayer(), GraphicsLayer::ContentsLayerForMedia);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
