- Revision
- 243451
- Author
- [email protected]
- Date
- 2019-03-25 13:43:47 -0700 (Mon, 25 Mar 2019)
Log Message
Delete MetadataPreloadingNotPermitted, it is unused
https://bugs.webkit.org/show_bug.cgi?id=196202
<rdar://problem/49213611>
Reviewed by Jer Noble.
Source/WebCore:
No new tests, the flat was unused except in an existing test that was removed.
* html/MediaElementSession.cpp:
(WebCore::restrictionNames):
(WebCore::MediaElementSession::effectivePreloadForElement const):
* html/MediaElementSession.h:
* platform/graphics/cg/UTIRegistry.cpp:
(WebCore::defaultSupportedImageTypes):
* testing/Internals.cpp:
(WebCore::Internals::setMediaElementRestrictions):
LayoutTests:
* media/video-restricted-no-preload-metadata-expected.txt: Removed.
* media/video-restricted-no-preload-metadata.html: Removed.
Modified Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (243450 => 243451)
--- trunk/LayoutTests/ChangeLog 2019-03-25 20:39:59 UTC (rev 243450)
+++ trunk/LayoutTests/ChangeLog 2019-03-25 20:43:47 UTC (rev 243451)
@@ -1,3 +1,14 @@
+2019-03-25 Eric Carlson <[email protected]>
+
+ Delete MetadataPreloadingNotPermitted, it is unused
+ https://bugs.webkit.org/show_bug.cgi?id=196202
+ <rdar://problem/49213611>
+
+ Reviewed by Jer Noble.
+
+ * media/video-restricted-no-preload-metadata-expected.txt: Removed.
+ * media/video-restricted-no-preload-metadata.html: Removed.
+
2019-03-25 Jer Noble <[email protected]>
Add test for fix of #196095
Deleted: trunk/LayoutTests/media/video-restricted-no-preload-metadata-expected.txt (243450 => 243451)
--- trunk/LayoutTests/media/video-restricted-no-preload-metadata-expected.txt 2019-03-25 20:39:59 UTC (rev 243450)
+++ trunk/LayoutTests/media/video-restricted-no-preload-metadata-expected.txt 2019-03-25 20:43:47 UTC (rev 243451)
@@ -1,17 +0,0 @@
-
-Test that "no preloading restriction" disables preloading in spite of preload='auto'.
-
-** setting video.src
-EXPECTED (video.preload == 'auto') OK
-RUN(internals.setMediaElementRestrictions(video, 'MetadataPreloadingNotPermitted'))
-** Pausing...
-
-** 250ms timer fired
-EXPECTED (video.readyState == '0') OK
-EXPECTED (video.buffered.length == '0') OK
-RUN(video.load())
-
-EVENT(loadedmetadata)
-
-END OF TEST
-
Deleted: trunk/LayoutTests/media/video-restricted-no-preload-metadata.html (243450 => 243451)
--- trunk/LayoutTests/media/video-restricted-no-preload-metadata.html 2019-03-25 20:39:59 UTC (rev 243450)
+++ trunk/LayoutTests/media/video-restricted-no-preload-metadata.html 2019-03-25 20:43:47 UTC (rev 243451)
@@ -1,54 +0,0 @@
-<html>
- <head>
- <script src=""
- <script src=""
- <script>
- var loadCalled = false;
-
- function loadedmetadata()
- {
- consoleWrite("");
- if (!loadCalled)
- consoleWrite("*** FAIL: media data loaded before load() was called ***<br>");
-
- endTest();
- }
-
- function load()
- {
- consoleWrite("** 250ms timer fired");
- testExpected("video.readyState", HTMLMediaElement.HAVE_NOTHING);
- testExpected("video.buffered.length", 0, "==");
- loadCalled = true;
- run("video.load()");
- consoleWrite("");
- }
-
- function start()
- {
- if (!window.internals) {
- failTest('This test requires window.internals.');
- return;
- }
-
- findMediaElement();
- consoleWrite("** setting video.src");
- video.src = "" "content/test");
-
- testExpected("video.preload", "auto");
- waitForEvent('loadedmetadata', loadedmetadata);
- run("internals.setMediaElementRestrictions(video, 'MetadataPreloadingNotPermitted')");
-
- // Wait 250ms before load()ing to make sure setting src did not kick off the load.
- consoleWrite("** Pausing...<br>");
- setTimeout(load, 250);
- failTestIn(2000);
- }
- </script>
- </head>
-
- <body _onload_="start()">
- <video controls preload=auto></video>
- <p>Test that "no preloading restriction" disables preloading in spite of preload='auto'.</p>
- </body>
-</html>
Modified: trunk/Source/WebCore/ChangeLog (243450 => 243451)
--- trunk/Source/WebCore/ChangeLog 2019-03-25 20:39:59 UTC (rev 243450)
+++ trunk/Source/WebCore/ChangeLog 2019-03-25 20:43:47 UTC (rev 243451)
@@ -1,3 +1,22 @@
+2019-03-25 Eric Carlson <[email protected]>
+
+ Delete MetadataPreloadingNotPermitted, it is unused
+ https://bugs.webkit.org/show_bug.cgi?id=196202
+ <rdar://problem/49213611>
+
+ Reviewed by Jer Noble.
+
+ No new tests, the flat was unused except in an existing test that was removed.
+
+ * html/MediaElementSession.cpp:
+ (WebCore::restrictionNames):
+ (WebCore::MediaElementSession::effectivePreloadForElement const):
+ * html/MediaElementSession.h:
+ * platform/graphics/cg/UTIRegistry.cpp:
+ (WebCore::defaultSupportedImageTypes):
+ * testing/Internals.cpp:
+ (WebCore::Internals::setMediaElementRestrictions):
+
2019-03-25 Jer Noble <[email protected]>
Test for: 196095 Inband Text Track cues interspersed with Data cues can display out of order.
Modified: trunk/Source/WebCore/html/MediaElementSession.cpp (243450 => 243451)
--- trunk/Source/WebCore/html/MediaElementSession.cpp 2019-03-25 20:39:59 UTC (rev 243450)
+++ trunk/Source/WebCore/html/MediaElementSession.cpp 2019-03-25 20:43:47 UTC (rev 243451)
@@ -85,7 +85,6 @@
CASE(RequireUserGestureToShowPlaybackTargetPicker)
CASE(WirelessVideoPlaybackDisabled)
CASE(RequireUserGestureToAutoplayToExternalDevice)
- CASE(MetadataPreloadingNotPermitted)
CASE(AutoPreloadingNotPermitted)
CASE(InvisibleAutoplayNotPermitted)
CASE(OverrideUserGestureRequirementForMainContent)
@@ -690,9 +689,6 @@
if (pageExplicitlyAllowsElementToAutoplayInline(m_element))
return preload;
- if (m_restrictions & MetadataPreloadingNotPermitted)
- return MediaPlayer::None;
-
if (m_restrictions & AutoPreloadingNotPermitted) {
if (preload > MediaPlayer::MetaData)
return MediaPlayer::MetaData;
Modified: trunk/Source/WebCore/html/MediaElementSession.h (243450 => 243451)
--- trunk/Source/WebCore/html/MediaElementSession.h 2019-03-25 20:39:59 UTC (rev 243450)
+++ trunk/Source/WebCore/html/MediaElementSession.h 2019-03-25 20:43:47 UTC (rev 243451)
@@ -117,7 +117,6 @@
RequireUserGestureToShowPlaybackTargetPicker = 1 << 6,
WirelessVideoPlaybackDisabled = 1 << 7,
RequireUserGestureToAutoplayToExternalDevice = 1 << 8,
- MetadataPreloadingNotPermitted = 1 << 9,
AutoPreloadingNotPermitted = 1 << 10,
InvisibleAutoplayNotPermitted = 1 << 11,
OverrideUserGestureRequirementForMainContent = 1 << 12,
Modified: trunk/Source/WebCore/testing/Internals.cpp (243450 => 243451)
--- trunk/Source/WebCore/testing/Internals.cpp 2019-03-25 20:39:59 UTC (rev 243450)
+++ trunk/Source/WebCore/testing/Internals.cpp 2019-03-25 20:43:47 UTC (rev 243451)
@@ -3850,8 +3850,6 @@
#endif
if (equalLettersIgnoringASCIICase(restrictionString, "requireusergestureforaudioratechange"))
restrictions |= MediaElementSession::RequireUserGestureForAudioRateChange;
- if (equalLettersIgnoringASCIICase(restrictionString, "metadatapreloadingnotpermitted"))
- restrictions |= MediaElementSession::MetadataPreloadingNotPermitted;
if (equalLettersIgnoringASCIICase(restrictionString, "autopreloadingnotpermitted"))
restrictions |= MediaElementSession::AutoPreloadingNotPermitted;
if (equalLettersIgnoringASCIICase(restrictionString, "invisibleautoplaynotpermitted"))
