<!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>[236943] 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/236943">236943</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2018-10-08 15:27:48 -0700 (Mon, 08 Oct 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/236941">r236941</a>.
https://bugs.webkit.org/show_bug.cgi?id=190374

Causing API test failures in new test (Requested by jernoble
on #webkit).

Reverted changeset:

"ISOTrackEncryptionBox returns incorrect defaultKeyID"
https://bugs.webkit.org/show_bug.cgi?id=190368
https://trac.webkit.org/changeset/236941</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsisoISOBoxh">trunk/Source/WebCore/platform/graphics/iso/ISOBox.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsisoISOOriginalFormatBoxh">trunk/Source/WebCore/platform/graphics/iso/ISOOriginalFormatBox.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsisoISOProtectionSchemeInfoBoxh">trunk/Source/WebCore/platform/graphics/iso/ISOProtectionSchemeInfoBox.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsisoISOProtectionSystemSpecificHeaderBoxh">trunk/Source/WebCore/platform/graphics/iso/ISOProtectionSystemSpecificHeaderBox.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsisoISOSchemeInformationBoxh">trunk/Source/WebCore/platform/graphics/iso/ISOSchemeInformationBox.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsisoISOSchemeTypeBoxh">trunk/Source/WebCore/platform/graphics/iso/ISOSchemeTypeBox.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsisoISOTrackEncryptionBoxcpp">trunk/Source/WebCore/platform/graphics/iso/ISOTrackEncryptionBox.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsisoISOTrackEncryptionBoxh">trunk/Source/WebCore/platform/graphics/iso/ISOTrackEncryptionBox.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestWebKitAPIxcodeprojprojectpbxproj">trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkToolsTestWebKitAPITestsWebCoreISOBoxcpp">trunk/Tools/TestWebKitAPI/Tests/WebCore/ISOBox.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (236942 => 236943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2018-10-08 22:08:41 UTC (rev 236942)
+++ trunk/Source/WebCore/ChangeLog      2018-10-08 22:27:48 UTC (rev 236943)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2018-10-08  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r236941.
+        https://bugs.webkit.org/show_bug.cgi?id=190374
+
+        Causing API test failures in new test (Requested by jernoble
+        on #webkit).
+
+        Reverted changeset:
+
+        "ISOTrackEncryptionBox returns incorrect defaultKeyID"
+        https://bugs.webkit.org/show_bug.cgi?id=190368
+        https://trac.webkit.org/changeset/236941
+
</ins><span class="cx"> 2018-10-08  Aditya Keerthi  <akeerthi@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Make <input type=color> a runtime enabled (on-by-default) feature
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (236942 => 236943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj   2018-10-08 22:08:41 UTC (rev 236942)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj      2018-10-08 22:27:48 UTC (rev 236943)
</span><span class="lines">@@ -4011,13 +4011,6 @@
</span><span class="cx">          CD5896E21CD2B15100B3BCC8 /* WebPlaybackControlsManager.h in Headers */ = {isa = PBXBuildFile; fileRef = CD5896E01CD2B15100B3BCC8 /* WebPlaybackControlsManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">          CD5D27781E8318E000D80A3D /* WebCoreDecompressionSession.h in Headers */ = {isa = PBXBuildFile; fileRef = CD5D27761E8318E000D80A3D /* WebCoreDecompressionSession.h */; };
</span><span class="cx">          CD5E5B5F1A15CE54000C609E /* PageConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = CD5E5B5E1A15CE54000C609E /* PageConfiguration.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>-               CD5FF4972162E2B7004BD86F /* ISOTrackEncryptionBox.h in Headers */ = {isa = PBXBuildFile; fileRef = CD871C661FB52B6800F0B965 /* ISOTrackEncryptionBox.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               CD5FF4992162E2BE004BD86F /* ISOBox.h in Headers */ = {isa = PBXBuildFile; fileRef = CD871C621FB52B6500F0B965 /* ISOBox.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               CD5FF49A2162E4A6004BD86F /* ISOSchemeInformationBox.h in Headers */ = {isa = PBXBuildFile; fileRef = CD871C641FB52B6700F0B965 /* ISOSchemeInformationBox.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               CD5FF49B2162E4B7004BD86F /* ISOSchemeTypeBox.h in Headers */ = {isa = PBXBuildFile; fileRef = CD871C5C1FB52B6300F0B965 /* ISOSchemeTypeBox.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               CD5FF49C2162E4CF004BD86F /* ISOProtectionSystemSpecificHeaderBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 12F75A9A86EA03DAF24B7971 /* ISOProtectionSystemSpecificHeaderBox.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               CD5FF49D2162E4DB004BD86F /* ISOProtectionSchemeInfoBox.h in Headers */ = {isa = PBXBuildFile; fileRef = CD871C601FB52B6500F0B965 /* ISOProtectionSchemeInfoBox.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               CD5FF49E2162E4E8004BD86F /* ISOOriginalFormatBox.h in Headers */ = {isa = PBXBuildFile; fileRef = CD871C671FB52B6800F0B965 /* ISOOriginalFormatBox.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx">           CD61FE681794AADB004101EB /* MediaSourceRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = B1A942E215B5CE2200D525D1 /* MediaSourceRegistry.h */; };
</span><span class="cx">          CD62FB961AF018E70012ED7D /* GenericTaskQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = CD62FB941AF018E70012ED7D /* GenericTaskQueue.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">          CD641EB31818F5ED00EE4C41 /* MediaSourcePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = CD641EB11818F5ED00EE4C41 /* MediaSourcePrivate.h */; };
</span><span class="lines">@@ -28587,13 +28580,6 @@
</span><span class="cx">                          11310CF120BA4A1B0065A8D0 /* Invalidation.h in Headers */,
</span><span class="cx">                          2D0B4AAB18DA1CCD00434DE1 /* IOSurface.h in Headers */,
</span><span class="cx">                          1C21E57D183ED1FF001C289D /* IOSurfacePool.h in Headers */,
</span><del>-                               CD5FF4992162E2BE004BD86F /* ISOBox.h in Headers */,
-                               CD5FF49E2162E4E8004BD86F /* ISOOriginalFormatBox.h in Headers */,
-                               CD5FF49D2162E4DB004BD86F /* ISOProtectionSchemeInfoBox.h in Headers */,
-                               CD5FF49C2162E4CF004BD86F /* ISOProtectionSystemSpecificHeaderBox.h in Headers */,
-                               CD5FF49A2162E4A6004BD86F /* ISOSchemeInformationBox.h in Headers */,
-                               CD5FF49B2162E4B7004BD86F /* ISOSchemeTypeBox.h in Headers */,
-                               CD5FF4972162E2B7004BD86F /* ISOTrackEncryptionBox.h in Headers */,
</del><span class="cx">                           71247E381FEA5F86008C08CE /* IterationCompositeOperation.h in Headers */,
</span><span class="cx">                          7C30D9841F815AEC00268356 /* JSAbortController.h in Headers */,
</span><span class="cx">                          7C30D9861F815AEC00268356 /* JSAbortSignal.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsisoISOBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/iso/ISOBox.h (236942 => 236943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/iso/ISOBox.h      2018-10-08 22:08:41 UTC (rev 236942)
+++ trunk/Source/WebCore/platform/graphics/iso/ISOBox.h 2018-10-08 22:27:48 UTC (rev 236943)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-class WEBCORE_EXPORT ISOBox {
</del><ins>+class ISOBox {
</ins><span class="cx"> public:
</span><span class="cx">     virtual ~ISOBox() = default;
</span><span class="cx"> 
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx">     Vector<uint8_t> m_extendedType;
</span><span class="cx"> };
</span><span class="cx"> 
</span><del>-class WEBCORE_EXPORT ISOFullBox : public ISOBox {
</del><ins>+class ISOFullBox : public ISOBox {
</ins><span class="cx"> public:
</span><span class="cx">     uint8_t version() const { return m_version; }
</span><span class="cx">     uint32_t flags() const { return m_flags; }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsisoISOOriginalFormatBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/iso/ISOOriginalFormatBox.h (236942 => 236943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/iso/ISOOriginalFormatBox.h        2018-10-08 22:08:41 UTC (rev 236942)
+++ trunk/Source/WebCore/platform/graphics/iso/ISOOriginalFormatBox.h   2018-10-08 22:27:48 UTC (rev 236943)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-class WEBCORE_EXPORT ISOOriginalFormatBox : public ISOBox {
</del><ins>+class ISOOriginalFormatBox : public ISOBox {
</ins><span class="cx"> public:
</span><span class="cx">     static FourCC boxTypeName() { return "frma"; }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsisoISOProtectionSchemeInfoBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/iso/ISOProtectionSchemeInfoBox.h (236942 => 236943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/iso/ISOProtectionSchemeInfoBox.h  2018-10-08 22:08:41 UTC (rev 236942)
+++ trunk/Source/WebCore/platform/graphics/iso/ISOProtectionSchemeInfoBox.h     2018-10-08 22:27:48 UTC (rev 236943)
</span><span class="lines">@@ -32,11 +32,10 @@
</span><span class="cx"> class ISOSchemeTypeBox;
</span><span class="cx"> class ISOSchemeInformationBox;
</span><span class="cx"> 
</span><del>-class WEBCORE_EXPORT ISOProtectionSchemeInfoBox : public ISOFullBox {
</del><ins>+class ISOProtectionSchemeInfoBox : public ISOFullBox {
</ins><span class="cx"> public:
</span><span class="cx">     static FourCC boxTypeName() { return "sinf"; }
</span><span class="cx"> 
</span><del>-    const ISOOriginalFormatBox& originalFormatBox() const { return m_originalFormatBox; }
</del><span class="cx">     const ISOSchemeTypeBox* schemeTypeBox() const { return m_schemeTypeBox.get(); }
</span><span class="cx">     const ISOSchemeInformationBox* schemeInformationBox() const { return m_schemeInformationBox.get(); }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsisoISOProtectionSystemSpecificHeaderBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/iso/ISOProtectionSystemSpecificHeaderBox.h (236942 => 236943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/iso/ISOProtectionSystemSpecificHeaderBox.h        2018-10-08 22:08:41 UTC (rev 236942)
+++ trunk/Source/WebCore/platform/graphics/iso/ISOProtectionSystemSpecificHeaderBox.h   2018-10-08 22:27:48 UTC (rev 236943)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-class WEBCORE_EXPORT ISOProtectionSystemSpecificHeaderBox : public ISOFullBox {
</del><ins>+class ISOProtectionSystemSpecificHeaderBox : public ISOFullBox {
</ins><span class="cx"> public:
</span><span class="cx">     using KeyID = Vector<uint8_t>;
</span><span class="cx">     static FourCC boxTypeName() { return "pssh"; }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsisoISOSchemeInformationBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/iso/ISOSchemeInformationBox.h (236942 => 236943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/iso/ISOSchemeInformationBox.h     2018-10-08 22:08:41 UTC (rev 236942)
+++ trunk/Source/WebCore/platform/graphics/iso/ISOSchemeInformationBox.h        2018-10-08 22:27:48 UTC (rev 236943)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-class WEBCORE_EXPORT ISOSchemeInformationBox : public ISOBox {
</del><ins>+class ISOSchemeInformationBox : public ISOBox {
</ins><span class="cx"> public:
</span><span class="cx">     static FourCC boxTypeName() { return "schi"; }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsisoISOSchemeTypeBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/iso/ISOSchemeTypeBox.h (236942 => 236943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/iso/ISOSchemeTypeBox.h    2018-10-08 22:08:41 UTC (rev 236942)
+++ trunk/Source/WebCore/platform/graphics/iso/ISOSchemeTypeBox.h       2018-10-08 22:27:48 UTC (rev 236943)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-class WEBCORE_EXPORT ISOSchemeTypeBox : public ISOFullBox {
</del><ins>+class ISOSchemeTypeBox : public ISOFullBox {
</ins><span class="cx"> public:
</span><span class="cx">     static FourCC boxTypeName() { return "schm"; }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsisoISOTrackEncryptionBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/iso/ISOTrackEncryptionBox.cpp (236942 => 236943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/iso/ISOTrackEncryptionBox.cpp     2018-10-08 22:08:41 UTC (rev 236942)
+++ trunk/Source/WebCore/platform/graphics/iso/ISOTrackEncryptionBox.cpp        2018-10-08 22:27:48 UTC (rev 236943)
</span><span class="lines">@@ -39,11 +39,11 @@
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><span class="cx">     // unsigned int(8) reserved = 0;
</span><del>-    offset += 1;
</del><ins>+    offset += 2;
</ins><span class="cx"> 
</span><span class="cx">     if (!m_version) {
</span><span class="cx">         // unsigned int(8) reserved = 0;
</span><del>-        offset += 1;
</del><ins>+        offset += 2;
</ins><span class="cx">     } else {
</span><span class="cx">         int8_t cryptAndSkip = 0;
</span><span class="cx">         if (!checkedRead<int8_t>(cryptAndSkip, view, offset, BigEndian))
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsisoISOTrackEncryptionBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/iso/ISOTrackEncryptionBox.h (236942 => 236943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/iso/ISOTrackEncryptionBox.h       2018-10-08 22:08:41 UTC (rev 236942)
+++ trunk/Source/WebCore/platform/graphics/iso/ISOTrackEncryptionBox.h  2018-10-08 22:27:48 UTC (rev 236943)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-class WEBCORE_EXPORT ISOTrackEncryptionBox : public ISOFullBox {
</del><ins>+class ISOTrackEncryptionBox : public ISOFullBox {
</ins><span class="cx"> public:
</span><span class="cx">     static FourCC boxTypeName() { return "tenc"; }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (236942 => 236943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2018-10-08 22:08:41 UTC (rev 236942)
+++ trunk/Tools/ChangeLog       2018-10-08 22:27:48 UTC (rev 236943)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2018-10-08  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r236941.
+        https://bugs.webkit.org/show_bug.cgi?id=190374
+
+        Causing API test failures in new test (Requested by jernoble
+        on #webkit).
+
+        Reverted changeset:
+
+        "ISOTrackEncryptionBox returns incorrect defaultKeyID"
+        https://bugs.webkit.org/show_bug.cgi?id=190368
+        https://trac.webkit.org/changeset/236941
+
</ins><span class="cx"> 2018-10-08  Aditya Keerthi  <akeerthi@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Make <input type=color> a runtime enabled (on-by-default) feature
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestWebKitAPIxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (236942 => 236943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj        2018-10-08 22:08:41 UTC (rev 236942)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj   2018-10-08 22:27:48 UTC (rev 236943)
</span><span class="lines">@@ -728,7 +728,6 @@
</span><span class="cx">          CD57779D211CE91F001B371E /* video-with-audio-and-web-audio.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = CD57779B211CE6CE001B371E /* video-with-audio-and-web-audio.html */; };
</span><span class="cx">          CD59F53419E9110D00CF1835 /* file-with-mse.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = CD59F53219E910AA00CF1835 /* file-with-mse.html */; };
</span><span class="cx">          CD59F53519E9110D00CF1835 /* test-mse.mp4 in Copy Resources */ = {isa = PBXBuildFile; fileRef = CD59F53319E910BC00CF1835 /* test-mse.mp4 */; };
</span><del>-               CD5FF49F2162E943004BD86F /* ISOBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD5FF4962162E27E004BD86F /* ISOBox.cpp */; };
</del><span class="cx">           CD758A6F20572EA00071834A /* video-with-paused-audio-and-playing-muted.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = CD758A6E20572D540071834A /* video-with-paused-audio-and-playing-muted.html */; };
</span><span class="cx">          CD78E11D1DB7EA660014A2DE /* FullscreenDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = CD78E11A1DB7EA360014A2DE /* FullscreenDelegate.mm */; };
</span><span class="cx">          CD78E11E1DB7EE2A0014A2DE /* FullscreenDelegate.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = CD78E11B1DB7EA360014A2DE /* FullscreenDelegate.html */; };
</span><span class="lines">@@ -1960,7 +1959,6 @@
</span><span class="cx">          CD57779B211CE6CE001B371E /* video-with-audio-and-web-audio.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = "video-with-audio-and-web-audio.html"; sourceTree = "<group>"; };
</span><span class="cx">          CD59F53219E910AA00CF1835 /* file-with-mse.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "file-with-mse.html"; sourceTree = "<group>"; };
</span><span class="cx">          CD59F53319E910BC00CF1835 /* test-mse.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = "test-mse.mp4"; sourceTree = "<group>"; };
</span><del>-               CD5FF4962162E27E004BD86F /* ISOBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ISOBox.cpp; sourceTree = "<group>"; };
</del><span class="cx">           CD758A6E20572D540071834A /* video-with-paused-audio-and-playing-muted.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "video-with-paused-audio-and-playing-muted.html"; sourceTree = "<group>"; };
</span><span class="cx">          CD773F711C5057DB0002257C /* FeatureDefines.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = FeatureDefines.xcconfig; sourceTree = "<group>"; };
</span><span class="cx">          CD78E11A1DB7EA360014A2DE /* FullscreenDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FullscreenDelegate.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -2538,7 +2536,6 @@
</span><span class="cx">                          7A909A731D877475007E10F8 /* IntPoint.cpp */,
</span><span class="cx">                          7A909A741D877475007E10F8 /* IntRect.cpp */,
</span><span class="cx">                          7A909A751D877475007E10F8 /* IntSize.cpp */,
</span><del>-                               CD5FF4962162E27E004BD86F /* ISOBox.cpp */,
</del><span class="cx">                           14464012167A8305000BD218 /* LayoutUnit.cpp */,
</span><span class="cx">                          076E507E1F45031E006E9F5A /* Logging.cpp */,
</span><span class="cx">                          CE1866471F72E8F100A0CAB6 /* MarkedText.cpp */,
</span><span class="lines">@@ -3866,7 +3863,6 @@
</span><span class="cx">                          7A909A821D877480007E10F8 /* IntRect.cpp in Sources */,
</span><span class="cx">                          7A909A831D877480007E10F8 /* IntSize.cpp in Sources */,
</span><span class="cx">                          5C0BF8931DD599BD00B00328 /* IsNavigationActionTrusted.mm in Sources */,
</span><del>-                               CD5FF49F2162E943004BD86F /* ISOBox.cpp in Sources */,
</del><span class="cx">                           5C69BDD51F82A7EF000F4F4B /* JavaScriptDuringNavigation.mm in Sources */,
</span><span class="cx">                          7CCE7EAD1A411A3400447C4C /* JavaScriptTest.cpp in Sources */,
</span><span class="cx">                          7CCE7EA51A411A0800447C4C /* JavaScriptTestMac.mm in Sources */,
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreISOBoxcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/TestWebKitAPI/Tests/WebCore/ISOBox.cpp (236942 => 236943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/ISOBox.cpp       2018-10-08 22:08:41 UTC (rev 236942)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/ISOBox.cpp  2018-10-08 22:27:48 UTC (rev 236943)
</span><span class="lines">@@ -1,76 +0,0 @@
</span><del>-/*
- * Copyright (C) 2018 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#include "Test.h"
-#include <JavaScriptCore/DataView.h>
-#include <WebCore/ISOProtectionSchemeInfoBox.h>
-#include <WebCore/ISOSchemeInformationBox.h>
-#include <WebCore/ISOSchemeTypeBox.h>
-#include <WebCore/ISOTrackEncryptionBox.h>
-#include <wtf/text/Base64.h>
-
-using namespace WebCore;
-
-namespace TestWebKitAPI {
-
-static const char* base64EncodedSinfWithKeyID3 = "AAAAYXNpbmYAAAAMZnJtYW1wNGEAAAAUc2NobQAAAABjYmNzAAEAAAAAADlzY2hpAAAAMXRlbmMBAAAAAAABAAAAAAAAAAAAAAAAAAAAAAMQ1fvWuC7ZPk75iuQJMe4ztw==";
-
-TEST(ISOBox, ISOProtectionSchemeInfoBox)
-{
-    Vector<uint8_t> sinfArray;
-    ASSERT_TRUE(base64Decode(StringView(base64EncodedSinfWithKeyID3), sinfArray));
-    ASSERT_EQ(93UL, sinfArray.size());
-
-    auto view = JSC::DataView::create(ArrayBuffer::create(sinfArray.data(), sinfArray.size()), 0, sinfArray.size());
-
-    ISOProtectionSchemeInfoBox sinfBox;
-    ASSERT_TRUE(sinfBox.read(view));
-    ASSERT_EQ(FourCC('mp4a'), sinfBox.originalFormatBox().dataFormat());
-
-    auto* schemeTypeBox = sinfBox.schemeTypeBox();
-    ASSERT_NOT_NULL(schemeTypeBox);
-    ASSERT_EQ(FourCC('cbcs'), schemeTypeBox->schemeType());
-    ASSERT_EQ(1U, schemeTypeBox->schemeVersion());
-
-    auto* schemeInformationBox = sinfBox.schemeInformationBox();
-    ASSERT_NOT_NULL(schemeInformationBox);
-
-    auto* trackEncryptionBox = downcast<ISOTrackEncryptionBox>(schemeInformationBox->schemeSpecificData());
-    ASSERT_NOT_NULL(trackEncryptionBox);
-    ASSERT_FALSE(trackEncryptionBox->defaultCryptByteBlock());
-    ASSERT_FALSE(trackEncryptionBox->defaultSkipByteBlock());
-    ASSERT_EQ(1, trackEncryptionBox->defaultIsProtected());
-    ASSERT_EQ(0, trackEncryptionBox->defaultPerSampleIVSize());
-
-    Vector<uint8_t> defaultKeyID = {0, 0, 0, 0, 0, 0, 0, 3};
-    ASSERT_EQ(defaultKeyID, trackEncryptionBox->defaultKID());
-
-    Vector<uint8_t> defaultIV = {0xD5, 0xFB, 0xD6, 0xB8, 0x2E, 0xD9, 0x3E, 0x4E, 0xF9, 0x8A, 0xE4, 0x09, 0x31, 0xEE, 0x33, 0xB7};
-    ASSERT_EQ(defaultIV, trackEncryptionBox->defaultConstantIV());
-}
-
-}
</del></span></pre>
</div>
</div>

</body>
</html>