<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[243451] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/243451">243451</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2019-03-25 13:43:47 -0700 (Mon, 25 Mar 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>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.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlMediaElementSessioncpp">trunk/Source/WebCore/html/MediaElementSession.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlMediaElementSessionh">trunk/Source/WebCore/html/MediaElementSession.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediavideorestrictednopreloadmetadataexpectedtxt">trunk/LayoutTests/media/video-restricted-no-preload-metadata-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediavideorestrictednopreloadmetadatahtml">trunk/LayoutTests/media/video-restricted-no-preload-metadata.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (243450 => 243451)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2019-03-25 20:39:59 UTC (rev 243450)
+++ trunk/LayoutTests/ChangeLog 2019-03-25 20:43:47 UTC (rev 243451)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2019-03-25  Eric Carlson  <eric.carlson@apple.com>
+
+        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.
+
</ins><span class="cx"> 2019-03-25  Jer Noble  <jer.noble@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Add test for fix of #196095
</span></span></pre></div>
<a id="trunkLayoutTestsmediavideorestrictednopreloadmetadataexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/media/video-restricted-no-preload-metadata-expected.txt (243450 => 243451)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,17 +0,0 @@
</span><del>-
-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
-
</del></span></pre></div>
<a id="trunkLayoutTestsmediavideorestrictednopreloadmetadatahtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/media/video-restricted-no-preload-metadata.html (243450 => 243451)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,54 +0,0 @@
</span><del>-<html>
-    <head>
-        <script src="media-file.js"></script>
-        <script src="video-test.js"></script>
-        <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 = findMediaFile("video", "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>
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (243450 => 243451)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2019-03-25  Eric Carlson  <eric.carlson@apple.com>
+
+        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):
+
</ins><span class="cx"> 2019-03-25  Jer Noble  <jer.noble@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Test for: 196095 Inband Text Track cues interspersed with Data cues can display out of order.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaElementSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaElementSession.cpp (243450 => 243451)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -85,7 +85,6 @@
</span><span class="cx">     CASE(RequireUserGestureToShowPlaybackTargetPicker)
</span><span class="cx">     CASE(WirelessVideoPlaybackDisabled)
</span><span class="cx">     CASE(RequireUserGestureToAutoplayToExternalDevice)
</span><del>-    CASE(MetadataPreloadingNotPermitted)
</del><span class="cx">     CASE(AutoPreloadingNotPermitted)
</span><span class="cx">     CASE(InvisibleAutoplayNotPermitted)
</span><span class="cx">     CASE(OverrideUserGestureRequirementForMainContent)
</span><span class="lines">@@ -690,9 +689,6 @@
</span><span class="cx">     if (pageExplicitlyAllowsElementToAutoplayInline(m_element))
</span><span class="cx">         return preload;
</span><span class="cx"> 
</span><del>-    if (m_restrictions & MetadataPreloadingNotPermitted)
-        return MediaPlayer::None;
-
</del><span class="cx">     if (m_restrictions & AutoPreloadingNotPermitted) {
</span><span class="cx">         if (preload > MediaPlayer::MetaData)
</span><span class="cx">             return MediaPlayer::MetaData;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaElementSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaElementSession.h (243450 => 243451)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -117,7 +117,6 @@
</span><span class="cx">         RequireUserGestureToShowPlaybackTargetPicker = 1 << 6,
</span><span class="cx">         WirelessVideoPlaybackDisabled =  1 << 7,
</span><span class="cx">         RequireUserGestureToAutoplayToExternalDevice = 1 << 8,
</span><del>-        MetadataPreloadingNotPermitted = 1 << 9,
</del><span class="cx">         AutoPreloadingNotPermitted = 1 << 10,
</span><span class="cx">         InvisibleAutoplayNotPermitted = 1 << 11,
</span><span class="cx">         OverrideUserGestureRequirementForMainContent = 1 << 12,
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (243450 => 243451)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -3850,8 +3850,6 @@
</span><span class="cx"> #endif
</span><span class="cx">         if (equalLettersIgnoringASCIICase(restrictionString, "requireusergestureforaudioratechange"))
</span><span class="cx">             restrictions |= MediaElementSession::RequireUserGestureForAudioRateChange;
</span><del>-        if (equalLettersIgnoringASCIICase(restrictionString, "metadatapreloadingnotpermitted"))
-            restrictions |= MediaElementSession::MetadataPreloadingNotPermitted;
</del><span class="cx">         if (equalLettersIgnoringASCIICase(restrictionString, "autopreloadingnotpermitted"))
</span><span class="cx">             restrictions |= MediaElementSession::AutoPreloadingNotPermitted;
</span><span class="cx">         if (equalLettersIgnoringASCIICase(restrictionString, "invisibleautoplaynotpermitted"))
</span></span></pre>
</div>
</div>

</body>
</html>