- Revision
- 218313
- Author
- [email protected]
- Date
- 2017-06-14 20:36:06 -0700 (Wed, 14 Jun 2017)
Log Message
Rebaseline media/modern-media-controls/media-documents
https://bugs.webkit.org/show_bug.cgi?id=173394
Patch by Antoine Quint <[email protected]> on 2017-06-14
Reviewed by Dean Jackson.
Source/WebCore:
We found two issues related to media documents while rebaselining the dedicated tests.
First, we needed to expose the --inline-controls-bar-height CSS variable to <video>
elements in media documents that are actually showing an audio UI. Previously we would
only expose the variable to <audio> elements.
Also, due to webkit.org/b/173387, we would fail to identify certain media documents as
video because the videoTracks weren't set yet when the "loadedmetadata" event would be
triggered. So now we also look at the videoWidth and videoHeight properties, which should
provide accurate information in the "loadedmetadata" event handler.
* Modules/modern-media-controls/controls/media-controls.css:
(:host(audio), :host(video.media-document.audio), *):
(:host(audio), *): Deleted.
* Modules/modern-media-controls/media/media-controller.js:
(MediaController.prototype.get isAudio):
LayoutTests:
* media/modern-media-controls/media-documents/click-on-video-should-not-pause-expected.txt:
* media/modern-media-controls/media-documents/click-on-video-should-not-pause.html:
* media/modern-media-controls/media-documents/media-document-audio-mac-sizing-expected.txt:
* media/modern-media-controls/media-documents/media-document-audio-mac-sizing.html:
* platform/ios-simulator/TestExpectations:
* platform/mac/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (218312 => 218313)
--- trunk/LayoutTests/ChangeLog 2017-06-15 03:31:35 UTC (rev 218312)
+++ trunk/LayoutTests/ChangeLog 2017-06-15 03:36:06 UTC (rev 218313)
@@ -1,3 +1,17 @@
+2017-06-14 Antoine Quint <[email protected]>
+
+ Rebaseline media/modern-media-controls/media-documents
+ https://bugs.webkit.org/show_bug.cgi?id=173394
+
+ Reviewed by Dean Jackson.
+
+ * media/modern-media-controls/media-documents/click-on-video-should-not-pause-expected.txt:
+ * media/modern-media-controls/media-documents/click-on-video-should-not-pause.html:
+ * media/modern-media-controls/media-documents/media-document-audio-mac-sizing-expected.txt:
+ * media/modern-media-controls/media-documents/media-document-audio-mac-sizing.html:
+ * platform/ios-simulator/TestExpectations:
+ * platform/mac/TestExpectations:
+
2017-06-14 Dean Jackson <[email protected]>
Restrict filtered painting across cross-origin boundaries with transforms
Modified: trunk/LayoutTests/media/modern-media-controls/media-documents/click-on-video-should-not-pause-expected.txt (218312 => 218313)
--- trunk/LayoutTests/media/modern-media-controls/media-documents/click-on-video-should-not-pause-expected.txt 2017-06-15 03:31:35 UTC (rev 218312)
+++ trunk/LayoutTests/media/modern-media-controls/media-documents/click-on-video-should-not-pause-expected.txt 2017-06-15 03:36:06 UTC (rev 218313)
@@ -6,7 +6,7 @@
PASS video.paused is false
Clicking on video controls
-PASS video.paused is false
+PASS video.paused became false
PASS successfullyParsed is true
Modified: trunk/LayoutTests/media/modern-media-controls/media-documents/click-on-video-should-not-pause.html (218312 => 218313)
--- trunk/LayoutTests/media/modern-media-controls/media-documents/click-on-video-should-not-pause.html 2017-06-15 03:31:35 UTC (rev 218312)
+++ trunk/LayoutTests/media/modern-media-controls/media-documents/click-on-video-should-not-pause.html 2017-06-15 03:36:06 UTC (rev 218313)
@@ -30,15 +30,15 @@
const bounds = video.getBoundingClientRect();
debug("");
debug("Clicking on video controls");
- window.eventSender.mouseMoveTo(bounds.left + 5, bounds.bottom - 5);
+ window.eventSender.mouseMoveTo(bounds.left + 1, bounds.bottom - 1);
window.eventSender.mouseDown();
window.eventSender.mouseUp();
- shouldBeFalse("video.paused");
-
- debug("");
- iframe.remove();
- finishJSTest();
+ shouldBecomeEqual("video.paused", "false", () => {
+ debug("");
+ iframe.remove();
+ finishJSTest();
+ });
}
})();
Modified: trunk/LayoutTests/media/modern-media-controls/media-documents/media-document-audio-mac-sizing-expected.txt (218312 => 218313)
--- trunk/LayoutTests/media/modern-media-controls/media-documents/media-document-audio-mac-sizing-expected.txt 2017-06-15 03:31:35 UTC (rev 218312)
+++ trunk/LayoutTests/media/modern-media-controls/media-documents/media-document-audio-mac-sizing-expected.txt 2017-06-15 03:36:06 UTC (rev 218313)
@@ -4,7 +4,7 @@
PASS getComputedStyle(media).width became "650px"
-PASS getComputedStyle(media).height is "25px"
+PASS getComputedStyle(media).height is "31px"
PASS successfullyParsed is true
Modified: trunk/LayoutTests/media/modern-media-controls/media-documents/media-document-audio-mac-sizing.html (218312 => 218313)
--- trunk/LayoutTests/media/modern-media-controls/media-documents/media-document-audio-mac-sizing.html 2017-06-15 03:31:35 UTC (rev 218312)
+++ trunk/LayoutTests/media/modern-media-controls/media-documents/media-document-audio-mac-sizing.html 2017-06-15 03:36:06 UTC (rev 218313)
@@ -19,7 +19,7 @@
}
shouldBecomeEqualToString("getComputedStyle(media).width", "650px", () => {
- shouldBeEqualToString("getComputedStyle(media).height", "25px");
+ shouldBeEqualToString("getComputedStyle(media).height", "31px");
debug("");
iframe.remove();
Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (218312 => 218313)
--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-06-15 03:31:35 UTC (rev 218312)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-06-15 03:36:06 UTC (rev 218313)
@@ -80,6 +80,7 @@
media/modern-media-controls/invalid-placard [ Pass ]
media/modern-media-controls/layout-item [ Pass ]
media/modern-media-controls/layout-node [ Pass ]
+media/modern-media-controls/media-documents [ Pass ]
media/modern-media-controls/mute-button [ Pass ]
media/modern-media-controls/mute-support [ Pass ]
media/modern-media-controls/pip-button [ Pass ]
@@ -119,6 +120,8 @@
# These tests are designed to work only on macOS
media/modern-media-controls/placard-support/placard-support-pip.html [ Skip ]
+media/modern-media-controls/media-documents/media-document-audio-mac-sizing.html [ Skip ]
+media/modern-media-controls/media-documents/media-document-video-mac-sizing.html [ Skip ]
webkit.org/b/172965 media/track/track-cue-overlap-snap-to-lines-not-set.html [ Failure ]
Modified: trunk/LayoutTests/platform/mac/TestExpectations (218312 => 218313)
--- trunk/LayoutTests/platform/mac/TestExpectations 2017-06-15 03:31:35 UTC (rev 218312)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2017-06-15 03:36:06 UTC (rev 218313)
@@ -1562,6 +1562,7 @@
media/modern-media-controls/layout-node [ Pass ]
media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-drag-is-prevented-over-button.html [ Pass ]
media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-drag.html [ Pass ]
+media/modern-media-controls/media-documents [ Pass ]
media/modern-media-controls/mute-button [ Pass ]
media/modern-media-controls/mute-support [ Pass ]
media/modern-media-controls/pip-button [ Pass ]
@@ -1584,6 +1585,9 @@
# These tests are iOS-specific
media/modern-media-controls/audio/audio-controls-styles.html [ Skip ]
media/modern-media-controls/placard-support/ipad [ Skip ]
+media/modern-media-controls/media-documents/ipad [ Skip ]
+media/modern-media-controls/media-documents/media-document-audio-ios-sizing.html [ Skip ]
+media/modern-media-controls/media-documents/media-document-video-ios-sizing.html [ Skip ]
# These tests use Picture-in-Picture which isn't supported on El Capitan.
[ ElCapitan ] media/modern-media-controls/placard-support/placard-support-pip.html [ Skip ]
Modified: trunk/Source/WebCore/ChangeLog (218312 => 218313)
--- trunk/Source/WebCore/ChangeLog 2017-06-15 03:31:35 UTC (rev 218312)
+++ trunk/Source/WebCore/ChangeLog 2017-06-15 03:36:06 UTC (rev 218313)
@@ -1,3 +1,27 @@
+2017-06-14 Antoine Quint <[email protected]>
+
+ Rebaseline media/modern-media-controls/media-documents
+ https://bugs.webkit.org/show_bug.cgi?id=173394
+
+ Reviewed by Dean Jackson.
+
+ We found two issues related to media documents while rebaselining the dedicated tests.
+
+ First, we needed to expose the --inline-controls-bar-height CSS variable to <video>
+ elements in media documents that are actually showing an audio UI. Previously we would
+ only expose the variable to <audio> elements.
+
+ Also, due to webkit.org/b/173387, we would fail to identify certain media documents as
+ video because the videoTracks weren't set yet when the "loadedmetadata" event would be
+ triggered. So now we also look at the videoWidth and videoHeight properties, which should
+ provide accurate information in the "loadedmetadata" event handler.
+
+ * Modules/modern-media-controls/controls/media-controls.css:
+ (:host(audio), :host(video.media-document.audio), *):
+ (:host(audio), *): Deleted.
+ * Modules/modern-media-controls/media/media-controller.js:
+ (MediaController.prototype.get isAudio):
+
2017-06-14 Zalan Bujtas <[email protected]>
animations-paused-in-background-page.html and animated-svg-image-removed-from-document-paused.html fail after r218284
Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.css (218312 => 218313)
--- trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.css 2017-06-15 03:31:35 UTC (rev 218312)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.css 2017-06-15 03:36:06 UTC (rev 218313)
@@ -44,7 +44,7 @@
--secondary-glyph-color: rgba(255, 255, 255, 0.55);
}
-:host(audio), * {
+:host(audio), :host(video.media-document.audio), * {
/* This constant needs to stay in sync with the BottomControlsBarHeight JS constant. */
--inline-controls-bar-height: 31px;
}
Modified: trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller.js (218312 => 218313)
--- trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller.js 2017-06-15 03:31:35 UTC (rev 218312)
+++ trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller.js 2017-06-15 03:36:06 UTC (rev 218313)
@@ -71,6 +71,9 @@
if (this.media.readyState < HTMLMediaElement.HAVE_METADATA)
return false;
+ if (this.media.videoWidth || this.media.videoHeight)
+ return false;
+
return !this.media.videoTracks.length;
}
