<!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>[206440] 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/206440">206440</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2016-09-27 10:14:32 -0700 (Tue, 27 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove deprecated ENCRYPTED_MEDIA implementation.
https://bugs.webkit.org/show_bug.cgi?id=161010
Source/JavaScriptCore:
Reviewed by Eric Carlson.
Remove ENABLE_ENCRYPTED_MEDIA.
* Configurations/FeatureDefines.xcconfig:
Source/WebCore:
Reviewed by Eric Carlson.
Remove all references to the deprecated ENABLE_ENCRYPTED_MEDIA (leaving in place
the soon-to-be deprecated ENABLE_ENCRYPTED_MEDIA_V2).
* CMakeLists.txt:
* Configurations/FeatureDefines.xcconfig:
* DerivedSources.make:
* WebCore.xcodeproj/project.pbxproj:
* bindings/objc/DOMHTMLMediaElement.h:
* bindings/objc/DOMHTMLMediaElement.mm:
(-[DOMHTMLMediaElement canPlayType:]):
(-[DOMHTMLMediaElement canPlayType:keySystem:]): Deleted.
* bindings/js/JSDictionary.cpp:
* bindings/js/JSDictionary.h:
* dom/Element.idl:
* dom/EventNames.in:
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::selectNextSourceChild):
(WebCore::exceptionCodeForMediaKeyException): Deleted.
(WebCore::HTMLMediaElement::canPlayType): Deleted.
(WebCore::HTMLMediaElement::mediaPlayerKeyAdded): Deleted.
(WebCore::HTMLMediaElement::mediaPlayerKeyError): Deleted.
(WebCore::HTMLMediaElement::mediaPlayerKeyMessage): Deleted.
(WebCore::HTMLMediaElement::mediaPlayerKeyNeeded): Deleted.
* html/HTMLMediaElement.h:
* html/HTMLMediaElement.idl:
* html/MediaError.h:
* html/MediaError.idl:
* html/MediaKeyError.h:
* html/MediaKeyError.idl:
* html/MediaKeyEvent.cpp: Removed.
(WebCore::MediaKeyEvent::MediaKeyEvent): Deleted.
(WebCore::MediaKeyEvent::~MediaKeyEvent): Deleted.
(WebCore::MediaKeyEvent::eventInterface): Deleted.
* html/MediaKeyEvent.h: Removed.
* html/MediaKeyEvent.idl: Removed.
* platform/graphics/MediaPlayer.cpp:
(WebCore::MediaPlayer::nextBestMediaEngine):
(WebCore::MediaPlayer::generateKeyRequest): Deleted.
(WebCore::MediaPlayer::addKey): Deleted.
(WebCore::MediaPlayer::cancelKeyRequest): Deleted.
(WebCore::MediaPlayer::keyAdded): Deleted.
(WebCore::MediaPlayer::keyError): Deleted.
(WebCore::MediaPlayer::keyMessage): Deleted.
(WebCore::MediaPlayer::keyNeeded): Deleted.
* platform/graphics/MediaPlayer.h:
(WebCore::MediaPlayerClient::mediaPlayerKeyAdded): Deleted.
(WebCore::MediaPlayerClient::mediaPlayerKeyError): Deleted.
(WebCore::MediaPlayerClient::mediaPlayerKeyMessage): Deleted.
(WebCore::MediaPlayerClient::mediaPlayerKeyNeeded): Deleted.
* platform/graphics/MediaPlayerPrivate.h:
(WebCore::MediaPlayerPrivateInterface::addKey): Deleted.
(WebCore::MediaPlayerPrivateInterface::generateKeyRequest): Deleted.
(WebCore::MediaPlayerPrivateInterface::cancelKeyRequest): Deleted.
* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
* platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm:
(WebCore::CDMSessionAVContentKeySession::update):
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::supportsKeySystem):
(WebCore::MediaPlayerPrivateAVFoundationObjC::shouldWaitForLoadingOfResource):
(WebCore::MediaPlayerPrivateAVFoundationObjC::supportsType): Deleted.
(WebCore::MediaPlayerPrivateAVFoundationObjC::generateKeyRequest): Deleted.
(WebCore::MediaPlayerPrivateAVFoundationObjC::addKey): Deleted.
(WebCore::MediaPlayerPrivateAVFoundationObjC::cancelKeyRequest): Deleted.
* platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
(WebCore::MediaPlayerPrivateQTKit::supportsType): Deleted.
* testing/MockCDM.h:
Source/WebKit/mac:
Remove ENABLE_ENCRYPTED_MEDIA.
Reviewed by Eric Carlson.
* Configurations/FeatureDefines.xcconfig:
Source/WebKit2:
Reviewed by Eric Carlson.
Remove ENABLE_ENCRYPTED_MEDIA.
* Configurations/FeatureDefines.xcconfig:
Source/WTF:
Reviewed by Eric Carlson.
Remove ENABLE_ENCRYPTED_MEDIA.
* wtf/FeatureDefines.h:
Tools:
Reviewed by Eric Carlson.
* TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
LayoutTests:
Reviewed by Eric Carlson.
* fast/events/constructors/media-key-event-constructor-expected.txt: Removed.
* fast/events/constructors/media-key-event-constructor.html: Removed.
* media/encrypted-media/encrypted-media-can-play-type-expected.txt: Removed.
* media/encrypted-media/encrypted-media-can-play-type-webm-expected.txt: Removed.
* media/encrypted-media/encrypted-media-can-play-type-webm.html: Removed.
* media/encrypted-media/encrypted-media-can-play-type.html: Removed.
* platform/mac-wk1/js/dom/global-constructors-attributes-expected.txt:
* platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt:
* platform/mac/fast/events/constructors/media-key-event-constructor-expected.txt: Removed.
* platform/mac/js/dom/global-constructors-attributes-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacjsdomglobalconstructorsattributesexpectedtxt">trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk1jsdomglobalconstructorsattributesexpectedtxt">trunk/LayoutTests/platform/mac-wk1/js/dom/global-constructors-attributes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacyosemitejsdomglobalconstructorsattributesexpectedtxt">trunk/LayoutTests/platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig">trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfFeatureDefinesh">trunk/Source/WTF/wtf/FeatureDefines.h</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig">trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesmake">trunk/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDictionarycpp">trunk/Source/WebCore/bindings/js/JSDictionary.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDictionaryh">trunk/Source/WebCore/bindings/js/JSDictionary.h</a></li>
<li><a href="#trunkSourceWebCoredomElementidl">trunk/Source/WebCore/dom/Element.idl</a></li>
<li><a href="#trunkSourceWebCoredomEventNamesin">trunk/Source/WebCore/dom/EventNames.in</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementh">trunk/Source/WebCore/html/HTMLMediaElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementidl">trunk/Source/WebCore/html/HTMLMediaElement.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlMediaErrorh">trunk/Source/WebCore/html/MediaError.h</a></li>
<li><a href="#trunkSourceWebCorehtmlMediaErroridl">trunk/Source/WebCore/html/MediaError.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlMediaKeyErrorh">trunk/Source/WebCore/html/MediaKeyError.h</a></li>
<li><a href="#trunkSourceWebCorehtmlMediaKeyErroridl">trunk/Source/WebCore/html/MediaKeyError.idl</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayercpp">trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayerh">trunk/Source/WebCore/platform/graphics/MediaPlayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayerPrivateh">trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationcpp">trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationh">trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionAVContentKeySessionmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKitmm">trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm</a></li>
<li><a href="#trunkSourceWebCoretestingMockCDMh">trunk/Source/WebCore/testing/MockCDM.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig">trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMHTMLMediaElementh">trunk/Source/WebKit/mac/DOM/DOMHTMLMediaElement.h</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMHTMLMediaElementmm">trunk/Source/WebKit/mac/DOM/DOMHTMLMediaElement.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig">trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPIConfigurationsFeatureDefinesxcconfig">trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasteventsconstructorsmediakeyeventconstructorexpectedtxt">trunk/LayoutTests/fast/events/constructors/media-key-event-constructor-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventsconstructorsmediakeyeventconstructorhtml">trunk/LayoutTests/fast/events/constructors/media-key-event-constructor.html</a></li>
<li><a href="#trunkLayoutTestsmediaencryptedmediaencryptedmediacanplaytypeexpectedtxt">trunk/LayoutTests/media/encrypted-media/encrypted-media-can-play-type-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediaencryptedmediaencryptedmediacanplaytypewebmexpectedtxt">trunk/LayoutTests/media/encrypted-media/encrypted-media-can-play-type-webm-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediaencryptedmediaencryptedmediacanplaytypewebmhtml">trunk/LayoutTests/media/encrypted-media/encrypted-media-can-play-type-webm.html</a></li>
<li><a href="#trunkLayoutTestsmediaencryptedmediaencryptedmediacanplaytypehtml">trunk/LayoutTests/media/encrypted-media/encrypted-media-can-play-type.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacfasteventsconstructorsmediakeyeventconstructorexpectedtxt">trunk/LayoutTests/platform/mac/fast/events/constructors/media-key-event-constructor-expected.txt</a></li>
<li><a href="#trunkSourceWebCorehtmlMediaKeyEventcpp">trunk/Source/WebCore/html/MediaKeyEvent.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlMediaKeyEventh">trunk/Source/WebCore/html/MediaKeyEvent.h</a></li>
<li><a href="#trunkSourceWebCorehtmlMediaKeyEventidl">trunk/Source/WebCore/html/MediaKeyEvent.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/LayoutTests/ChangeLog 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-09-27 Jer Noble <jer.noble@apple.com>
+
+ Remove deprecated ENCRYPTED_MEDIA implementation.
+ https://bugs.webkit.org/show_bug.cgi?id=161010
+
+ Reviewed by Eric Carlson.
+
+ * fast/events/constructors/media-key-event-constructor-expected.txt: Removed.
+ * fast/events/constructors/media-key-event-constructor.html: Removed.
+ * media/encrypted-media/encrypted-media-can-play-type-expected.txt: Removed.
+ * media/encrypted-media/encrypted-media-can-play-type-webm-expected.txt: Removed.
+ * media/encrypted-media/encrypted-media-can-play-type-webm.html: Removed.
+ * media/encrypted-media/encrypted-media-can-play-type.html: Removed.
+ * platform/mac-wk1/js/dom/global-constructors-attributes-expected.txt:
+ * platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt:
+ * platform/mac/fast/events/constructors/media-key-event-constructor-expected.txt: Removed.
+ * platform/mac/js/dom/global-constructors-attributes-expected.txt:
+
</ins><span class="cx"> 2016-09-27 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2] Navigating to a Blob URL does not trigger a download
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventsconstructorsmediakeyeventconstructorexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/events/constructors/media-key-event-constructor-expected.txt (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/constructors/media-key-event-constructor-expected.txt 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/LayoutTests/fast/events/constructors/media-key-event-constructor-expected.txt 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -1,102 +0,0 @@
</span><del>-This tests the constructor for the MediaKeyEvent DOM class.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-
-*** No initializer passed ***
-PASS new MediaKeyEvent('MediaKeyEvent').bubbles is false
-PASS new MediaKeyEvent('MediaKeyEvent').cancelable is false
-PASS new MediaKeyEvent('MediaKeyEvent').keySystem is ""
-PASS new MediaKeyEvent('MediaKeyEvent').sessionId is ""
-PASS new MediaKeyEvent('MediaKeyEvent').initData is null
-PASS new MediaKeyEvent('MediaKeyEvent').message is null
-PASS new MediaKeyEvent('MediaKeyEvent').defaultURL is ""
-PASS new MediaKeyEvent('MediaKeyEvent').errorCode is null
-PASS new MediaKeyEvent('MediaKeyEvent').systemCode is 0
-
-*** Bubbles and cancelable true, other members are missing ***
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true }).bubbles is true
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true }).cancelable is true
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true }).keySystem is ""
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true }).sessionId is ""
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true }).initData is null
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true }).message is null
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true }).defaultURL is ""
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true }).errorCode is null
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true }).systemCode is 0
-
-*** Bubbles and cancelable true, invalid other members ***
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: undefined, sessionId: undefined, initData: Uint8Array, message: Uint8Array, defaultURL: undefined, errorCode: MediaKeyError, systemCode: undefined }).bubbles is true
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: undefined, sessionId: undefined, initData: Uint8Array, message: Uint8Array, defaultURL: undefined, errorCode: MediaKeyError, systemCode: undefined }).cancelable is true
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: undefined, sessionId: undefined, initData: Uint8Array, message: Uint8Array, defaultURL: undefined, errorCode: MediaKeyError, systemCode: undefined }).keySystem is "undefined"
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: undefined, sessionId: undefined, initData: Uint8Array, message: Uint8Array, defaultURL: undefined, errorCode: MediaKeyError, systemCode: undefined }).sessionId is "undefined"
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: undefined, sessionId: undefined, initData: Uint8Array, message: Uint8Array, defaultURL: undefined, errorCode: MediaKeyError, systemCode: undefined }).initData is null
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: undefined, sessionId: undefined, initData: Uint8Array, message: Uint8Array, defaultURL: undefined, errorCode: MediaKeyError, systemCode: undefined }).message is null
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: undefined, sessionId: undefined, initData: Uint8Array, message: Uint8Array, defaultURL: undefined, errorCode: MediaKeyError, systemCode: undefined }).defaultURL is "undefined"
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: undefined, sessionId: undefined, initData: Uint8Array, message: Uint8Array, defaultURL: undefined, errorCode: MediaKeyError, systemCode: undefined }).errorCode is null
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: undefined, sessionId: undefined, initData: Uint8Array, message: Uint8Array, defaultURL: undefined, errorCode: MediaKeyError, systemCode: undefined }).systemCode is 0
-
-*** Initialize 'keySystem' with a invalid values ***
-PASS new MediaKeyEvent('MediaKeyEvent', { keySystem: emptyObject }).keySystem is "[object Object]"
-PASS new MediaKeyEvent('MediaKeyEvent', { keySystem: document }).keySystem is "[object HTMLDocument]"
-
-*** Initialize 'sessionId' with a invalid values ***
-PASS new MediaKeyEvent('MediaKeyEvent', { sessionId: emptyObject }).sessionId is "[object Object]"
-PASS new MediaKeyEvent('MediaKeyEvent', { sessionId: document }).sessionId is "[object HTMLDocument]"
-
-*** Initialize 'initData' with a invalid values ***
-PASS new MediaKeyEvent('MediaKeyEvent', { initData: 10 }).initData is null
-PASS new MediaKeyEvent('MediaKeyEvent', { initData: 'string' }).initData is null
-PASS new MediaKeyEvent('MediaKeyEvent', { initData: emptyObject }).initData is null
-PASS new MediaKeyEvent('MediaKeyEvent', { initData: document }).initData is null
-
-*** Initialize 'message' with a invalid values ***
-PASS new MediaKeyEvent('MediaKeyEvent', { message: 10 }).message is null
-PASS new MediaKeyEvent('MediaKeyEvent', { message: 'string' }).message is null
-PASS new MediaKeyEvent('MediaKeyEvent', { message: emptyObject }).message is null
-PASS new MediaKeyEvent('MediaKeyEvent', { message: document }).message is null
-
-*** Initialize 'defaultURL' with a invalid values ***
-PASS new MediaKeyEvent('MediaKeyEvent', { defaultURL: emptyObject }).defaultURL is "[object Object]"
-PASS new MediaKeyEvent('MediaKeyEvent', { defaultURL: document }).defaultURL is "[object HTMLDocument]"
-
-*** Initialize 'errorCode' with a invalid values ***
-PASS new MediaKeyEvent('MediaKeyEvent', { errorCode: 10 }).errorCode is null
-PASS new MediaKeyEvent('MediaKeyEvent', { errorCode: 'string' }).errorCode is null
-PASS new MediaKeyEvent('MediaKeyEvent', { errorCode: emptyObject }).errorCode is null
-PASS new MediaKeyEvent('MediaKeyEvent', { errorCode: document }).errorCode is null
-
-*** Initialize 'systemCode' with a invalid values ***
-PASS new MediaKeyEvent('MediaKeyEvent', { systemCode: 'string' }).systemCode is 0
-PASS new MediaKeyEvent('MediaKeyEvent', { systemCode: emptyObject }).systemCode is 0
-PASS new MediaKeyEvent('MediaKeyEvent', { systemCode: document }).systemCode is 0
-
-*** Bubbles and cancelable true, valid other members ***
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).bubbles is true
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).cancelable is true
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).keySystem is "keySystem"
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).sessionId is "sessionId"
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).initData is initDataArray
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).message is messageArray
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).defaultURL is "defaultURL"
-FAIL new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).errorCode should be function MediaKeyError() { [native code] } (of type function). Was null (of type object).
-FAIL new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).errorCode.code should be 1. Threw exception TypeError: Cannot read property 'code' of null
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).systemCode is 123
-
-*** Initialize with valid members ***
-FAIL new MediaKeyEvent('MediaKeyEvent', { keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).bubbles should be true. Was false.
-FAIL new MediaKeyEvent('MediaKeyEvent', { keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).cancelable should be true. Was false.
-PASS new MediaKeyEvent('MediaKeyEvent', { keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).keySystem is "keySystem"
-PASS new MediaKeyEvent('MediaKeyEvent', { keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).sessionId is "sessionId"
-PASS new MediaKeyEvent('MediaKeyEvent', { keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).initData is initDataArray
-PASS new MediaKeyEvent('MediaKeyEvent', { keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).message is messageArray
-PASS new MediaKeyEvent('MediaKeyEvent', { keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).defaultURL is "defaultURL"
-FAIL new MediaKeyEvent('MediaKeyEvent', { keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).errorCode should be function MediaKeyError() { [native code] } (of type function). Was null (of type object).
-FAIL new MediaKeyEvent('MediaKeyEvent', { keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).errorCode.code should be 1. Threw exception TypeError: Cannot read property 'code' of null
-PASS new MediaKeyEvent('MediaKeyEvent', { keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).systemCode is 123
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
</del></span></pre></div>
<a id="trunkLayoutTestsfasteventsconstructorsmediakeyeventconstructorhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/events/constructors/media-key-event-constructor.html (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/constructors/media-key-event-constructor.html 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/LayoutTests/fast/events/constructors/media-key-event-constructor.html 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -1,135 +0,0 @@
</span><del>-<!DOCTYPE html>
-<html>
-<head>
- <script src="../../../resources/js-test-pre.js"></script>
-</head>
-
-<body>
- <script>
-
- window.jsTestIsAsync = true;
-
- description("This tests the constructor for the MediaKeyEvent DOM class.");
-
- function test()
- {
- debug("<br>*** No initializer passed ***");
- shouldBe("new MediaKeyEvent('MediaKeyEvent').bubbles", "false");
- shouldBe("new MediaKeyEvent('MediaKeyEvent').cancelable", "false");
- shouldBeEmptyString("new MediaKeyEvent('MediaKeyEvent').keySystem");
- shouldBeEmptyString("new MediaKeyEvent('MediaKeyEvent').sessionId");
- shouldBeNull("new MediaKeyEvent('MediaKeyEvent').initData");
- shouldBeNull("new MediaKeyEvent('MediaKeyEvent').message");
- shouldBeEmptyString("new MediaKeyEvent('MediaKeyEvent').defaultURL");
- shouldBeNull("new MediaKeyEvent('MediaKeyEvent').errorCode");
- shouldBeZero("new MediaKeyEvent('MediaKeyEvent').systemCode");
-
- debug("<br>*** Bubbles and cancelable true, other members are missing ***");
- shouldBe("new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true }).bubbles", "true");
- shouldBe("new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true }).cancelable", "true");
- shouldBeEmptyString("new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true }).keySystem");
- shouldBeEmptyString("new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true }).sessionId");
- shouldBeNull("new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true }).initData");
- shouldBeNull("new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true }).message");
- shouldBeEmptyString("new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true }).defaultURL");
- shouldBeNull("new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true }).errorCode");
- shouldBeZero("new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true }).systemCode");
-
- debug("<br>*** Bubbles and cancelable true, invalid other members ***");
- shouldBe("new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: undefined, sessionId: undefined, initData: Uint8Array, message: Uint8Array, defaultURL: undefined, errorCode: MediaKeyError, systemCode: undefined }).bubbles", "true");
- shouldBe("new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: undefined, sessionId: undefined, initData: Uint8Array, message: Uint8Array, defaultURL: undefined, errorCode: MediaKeyError, systemCode: undefined }).cancelable", "true");
- shouldBeEqualToString("new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: undefined, sessionId: undefined, initData: Uint8Array, message: Uint8Array, defaultURL: undefined, errorCode: MediaKeyError, systemCode: undefined }).keySystem", "undefined");
- shouldBeEqualToString("new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: undefined, sessionId: undefined, initData: Uint8Array, message: Uint8Array, defaultURL: undefined, errorCode: MediaKeyError, systemCode: undefined }).sessionId", "undefined");
- shouldBeNull("new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: undefined, sessionId: undefined, initData: Uint8Array, message: Uint8Array, defaultURL: undefined, errorCode: MediaKeyError, systemCode: undefined }).initData");
- shouldBeNull("new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: undefined, sessionId: undefined, initData: Uint8Array, message: Uint8Array, defaultURL: undefined, errorCode: MediaKeyError, systemCode: undefined }).message");
- shouldBeEqualToString("new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: undefined, sessionId: undefined, initData: Uint8Array, message: Uint8Array, defaultURL: undefined, errorCode: MediaKeyError, systemCode: undefined }).defaultURL", "undefined");
- shouldBeNull("new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: undefined, sessionId: undefined, initData: Uint8Array, message: Uint8Array, defaultURL: undefined, errorCode: MediaKeyError, systemCode: undefined }).errorCode");
- shouldBeZero("new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: undefined, sessionId: undefined, initData: Uint8Array, message: Uint8Array, defaultURL: undefined, errorCode: MediaKeyError, systemCode: undefined }).systemCode");
-
- debug("<br>*** Initialize 'keySystem' with a invalid values ***");
- emptyObject = { };
- shouldBeEqualToString("new MediaKeyEvent('MediaKeyEvent', { keySystem: emptyObject }).keySystem", "[object Object]");
- shouldBeEqualToString("new MediaKeyEvent('MediaKeyEvent', { keySystem: document }).keySystem", "[object HTMLDocument]");
-
- debug("<br>*** Initialize 'sessionId' with a invalid values ***");
- emptyObject = { };
- shouldBeEqualToString("new MediaKeyEvent('MediaKeyEvent', { sessionId: emptyObject }).sessionId", "[object Object]");
- shouldBeEqualToString("new MediaKeyEvent('MediaKeyEvent', { sessionId: document }).sessionId", "[object HTMLDocument]");
-
- debug("<br>*** Initialize 'initData' with a invalid values ***");
- shouldBeNull("new MediaKeyEvent('MediaKeyEvent', { initData: 10 }).initData");
- shouldBeNull("new MediaKeyEvent('MediaKeyEvent', { initData: \'string\' }).initData");
- emptyObject = { };
- shouldBeNull("new MediaKeyEvent('MediaKeyEvent', { initData: emptyObject }).initData");
- shouldBeNull("new MediaKeyEvent('MediaKeyEvent', { initData: document }).initData");
-
- debug("<br>*** Initialize 'message' with a invalid values ***");
- shouldBeNull("new MediaKeyEvent('MediaKeyEvent', { message: 10 }).message");
- shouldBeNull("new MediaKeyEvent('MediaKeyEvent', { message: \'string\' }).message");
- emptyObject = { };
- shouldBeNull("new MediaKeyEvent('MediaKeyEvent', { message: emptyObject }).message");
- shouldBeNull("new MediaKeyEvent('MediaKeyEvent', { message: document }).message");
-
- debug("<br>*** Initialize 'defaultURL' with a invalid values ***");
- emptyObject = { };
- shouldBeEqualToString("new MediaKeyEvent('MediaKeyEvent', { defaultURL: emptyObject }).defaultURL", "[object Object]");
- shouldBeEqualToString("new MediaKeyEvent('MediaKeyEvent', { defaultURL: document }).defaultURL", "[object HTMLDocument]");
-
- debug("<br>*** Initialize 'errorCode' with a invalid values ***");
- shouldBeNull("new MediaKeyEvent('MediaKeyEvent', { errorCode: 10 }).errorCode");
- shouldBeNull("new MediaKeyEvent('MediaKeyEvent', { errorCode: \'string\' }).errorCode");
- emptyObject = { };
- shouldBeNull("new MediaKeyEvent('MediaKeyEvent', { errorCode: emptyObject }).errorCode");
- shouldBeNull("new MediaKeyEvent('MediaKeyEvent', { errorCode: document }).errorCode");
-
- debug("<br>*** Initialize 'systemCode' with a invalid values ***");
- shouldBeZero("new MediaKeyEvent('MediaKeyEvent', { systemCode: \'string\' }).systemCode");
- emptyObject = { };
- shouldBeZero("new MediaKeyEvent('MediaKeyEvent', { systemCode: emptyObject }).systemCode");
- shouldBeZero("new MediaKeyEvent('MediaKeyEvent', { systemCode: document }).systemCode");
-
- debug("<br>*** Bubbles and cancelable true, valid other members ***");
- shouldBe("new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).bubbles", "true");
- shouldBe("new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).cancelable", "true");
- shouldBeEqualToString("new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).keySystem", "keySystem");
- shouldBeEqualToString("new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).sessionId", "sessionId");
- shouldBe("new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).initData", "initDataArray");
- shouldBe("new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).message", "messageArray");
- shouldBeEqualToString("new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).defaultURL", "defaultURL");
- // FIXME(82988): These two fail.
- shouldBe("new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).errorCode", "errorObject");
- shouldBe("new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).errorCode.code", "MediaKeyError.MEDIA_KEYERR_UNKNOWN");
- shouldBe("new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).systemCode", "123");
-
- debug("<br>*** Initialize with valid members ***");
- shouldBe("new MediaKeyEvent('MediaKeyEvent', { keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).bubbles", "true");
- shouldBe("new MediaKeyEvent('MediaKeyEvent', { keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).cancelable", "true");
- shouldBeEqualToString("new MediaKeyEvent('MediaKeyEvent', { keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).keySystem", "keySystem");
- shouldBeEqualToString("new MediaKeyEvent('MediaKeyEvent', { keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).sessionId", "sessionId");
- shouldBe("new MediaKeyEvent('MediaKeyEvent', { keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).initData", "initDataArray");
- shouldBe("new MediaKeyEvent('MediaKeyEvent', { keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).message", "messageArray");
- shouldBeEqualToString("new MediaKeyEvent('MediaKeyEvent', { keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).defaultURL", "defaultURL");
- // FIXME(82988): These two fail.
- shouldBe("new MediaKeyEvent('MediaKeyEvent', { keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).errorCode", "errorObject");
- shouldBe("new MediaKeyEvent('MediaKeyEvent', { keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).errorCode.code", "MediaKeyError.MEDIA_KEYERR_UNKNOWN");
- shouldBe("new MediaKeyEvent('MediaKeyEvent', { keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).systemCode", "123");
-
- debug("");
- finishJSTest();
- }
-
- var initDataArray = new Uint8Array([0x41, 0x42, 0x43]);
- var messageArray = new Uint8Array([0x51, 0x52, 0x53]);
- // FIXME(82988): This does not create an error like we want.
- var errorObject = window.MediaKeyError;
- // shouldBe("typeof errorObject", TBD);
-
- video = document.createElement('video');
- document.body.appendChild(video);
-
- test()
- </script>
- <script src="../../../resources/js-test-post.js"></script>
-
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsmediaencryptedmediaencryptedmediacanplaytypeexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/media/encrypted-media/encrypted-media-can-play-type-expected.txt (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/encrypted-media/encrypted-media-can-play-type-expected.txt 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/LayoutTests/media/encrypted-media/encrypted-media-can-play-type-expected.txt 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -1,75 +0,0 @@
</span><del>-Test Encrypted Media extension of HTMLMediaElement canPlayType() method.
-
-The test is designed to pass with any implementation regardless of supported media types and relies on the expected log to detect the expected results for some types. To get sufficient coverage, it is important that an implementation support clearkey encryption of at least one of the types below.
-
-Always return the empty string for no type.
-EXPECTED (video.canPlayType() == '') OK
-
-Always return the empty string for an empty type.
-EXPECTED (video.canPlayType('') == '') OK
-EXPECTED (video.canPlayType('', '') == '') OK
-EXPECTED (video.canPlayType('', null) == '') OK
-EXPECTED (video.canPlayType('', undefined) == '') OK
-EXPECTED (video.canPlayType('', 'webkit-org.w3.clearkey') == '') OK
-EXPECTED (video.canPlayType('', 'WeBkIt-OrG.W3.ClEaRkEy') == '') OK
-EXPECTED (video.canPlayType('', 'com.example.invalid') == '') OK
-
-Always return the empty string for when no container is specified.
-EXPECTED (video.canPlayType('video/') == '') OK
-EXPECTED (video.canPlayType('video/', '') == '') OK
-EXPECTED (video.canPlayType('video/', null) == '') OK
-EXPECTED (video.canPlayType('video/', undefined) == '') OK
-EXPECTED (video.canPlayType('video/', 'webkit-org.w3.clearkey') == '') OK
-EXPECTED (video.canPlayType('video/', 'WeBkIt-OrG.W3.ClEaRkEy') == '') OK
-EXPECTED (video.canPlayType('video/', 'com.example.invalid') == '') OK
-
-Always return the empty string for an unsupported container.
-EXPECTED (video.canPlayType('video/blahblah') == '') OK
-EXPECTED (video.canPlayType('video/blahblah', '') == '') OK
-EXPECTED (video.canPlayType('video/blahblah', null) == '') OK
-EXPECTED (video.canPlayType('video/blahblah', undefined) == '') OK
-EXPECTED (video.canPlayType('video/blahblah', 'webkit-org.w3.clearkey') == '') OK
-EXPECTED (video.canPlayType('video/blahblah', 'WeBkIt-OrG.W3.ClEaRkEy') == '') OK
-EXPECTED (video.canPlayType('video/blahblah', 'com.example.invalid') == '') OK
-
-Empty key system parameters should not affect the result of video/mp4 types.
-Result of video.canPlayType('video/mp4; Codecs="avc1.4D400C"'): ''
-EXPECTED (video.canPlayType('video/mp4; Codecs="avc1.4D400C"', '') == '') OK
-EXPECTED (video.canPlayType('video/mp4; Codecs="avc1.4D400C"', null) == '') OK
-EXPECTED (video.canPlayType('video/mp4; Codecs="avc1.4D400C"', undefined) == '') OK
-There are currently no implementations supporting encryption of video/mp4.
-EXPECTED (video.canPlayType('video/mp4; Codecs="avc1.4D400C"', 'webkit-org.w3.clearkey') == '') OK
-EXPECTED (video.canPlayType('video/mp4; Codecs="avc1.4D400C"', 'WeBkIt-OrG.W3.ClEaRkEy') == '') OK
-EXPECTED (video.canPlayType('video/mp4; Codecs="avc1.4D400C"', 'com.example.invalid') == '') OK
-
-Empty key system parameters should not affect the result of audio/mpeg types.
-Result of video.canPlayType('audio/mpeg'): ''
-EXPECTED (video.canPlayType('audio/mpeg', '') == '') OK
-EXPECTED (video.canPlayType('audio/mpeg', null) == '') OK
-EXPECTED (video.canPlayType('audio/mpeg', undefined) == '') OK
-There are currently no implementations supporting encryption of audio/mpeg.
-EXPECTED (video.canPlayType('audio/mpeg', 'webkit-org.w3.clearkey') == '') OK
-EXPECTED (video.canPlayType('audio/mpeg', 'WeBkIt-OrG.W3.ClEaRkEy') == '') OK
-EXPECTED (video.canPlayType('audio/mpeg', 'com.example.invalid') == '') OK
-
-Empty key system parameters should not affect the result of audio/wav types.
-Result of video.canPlayType('audio/wav'): 'maybe'
-EXPECTED (video.canPlayType('audio/wav', '') == 'maybe') OK
-EXPECTED (video.canPlayType('audio/wav', null) == 'maybe') OK
-EXPECTED (video.canPlayType('audio/wav', undefined) == 'maybe') OK
-There are currently no implementations supporting encryption of audio/wav.
-EXPECTED (video.canPlayType('audio/wav', 'webkit-org.w3.clearkey') == '') OK
-EXPECTED (video.canPlayType('audio/wav', 'WeBkIt-OrG.W3.ClEaRkEy') == '') OK
-EXPECTED (video.canPlayType('audio/wav', 'com.example.invalid') == '') OK
-
-Empty key system parameters should not affect the result of video/webm types.
-Result of video.canPlayType('video/webm'): 'maybe'
-EXPECTED (video.canPlayType('video/webm', '') == 'maybe') OK
-EXPECTED (video.canPlayType('video/webm', null) == 'maybe') OK
-EXPECTED (video.canPlayType('video/webm', undefined) == 'maybe') OK
-All implementations that support WebM and Encrypted Media support encrypted WebM.
-EXPECTED (video.canPlayType('video/webm', 'webkit-org.w3.clearkey') == 'maybe') OK
-EXPECTED (video.canPlayType('video/webm', 'WeBkIt-OrG.W3.ClEaRkEy') == 'maybe') OK
-EXPECTED (video.canPlayType('video/webm', 'com.example.invalid') == '') OK
-END OF TEST
-
</del></span></pre></div>
<a id="trunkLayoutTestsmediaencryptedmediaencryptedmediacanplaytypewebmexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/media/encrypted-media/encrypted-media-can-play-type-webm-expected.txt (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/encrypted-media/encrypted-media-can-play-type-webm-expected.txt 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/LayoutTests/media/encrypted-media/encrypted-media-can-play-type-webm-expected.txt 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -1,111 +0,0 @@
</span><del>-Test Encrypted Media extension of HTMLMediaElement canPlayType() method for WebM types.
-
-WebM video container without a codec results in "maybe".
-EXPECTED (video.canPlayType('video/webm') == 'maybe') OK
-EXPECTED (video.canPlayType('video/webm', '') == 'maybe') OK
-EXPECTED (video.canPlayType('video/webm', null) == 'maybe') OK
-EXPECTED (video.canPlayType('video/webm', undefined) == 'maybe') OK
-EXPECTED (video.canPlayType('video/webm', 'webkit-org.w3.clearkey') == 'maybe') OK
-EXPECTED (video.canPlayType('video/webm', 'WeBkIt-OrG.W3.ClEaRkEy') == 'maybe') OK
-EXPECTED (video.canPlayType('video/webm', 'com.example.invalid') == '') OK
-
-WebM video container with a valid codec results in "probably".
-EXPECTED (video.canPlayType('video/webm; codecs="vp8"') == 'probably') OK
-EXPECTED (video.canPlayType('video/webm; codecs="vp8"', '') == 'probably') OK
-EXPECTED (video.canPlayType('video/webm; codecs="vp8"', null) == 'probably') OK
-EXPECTED (video.canPlayType('video/webm; codecs="vp8"', undefined) == 'probably') OK
-EXPECTED (video.canPlayType('video/webm; codecs="vp8"', 'webkit-org.w3.clearkey') == 'probably') OK
-EXPECTED (video.canPlayType('video/webm; codecs="vp8"', 'WeBkIt-OrG.W3.ClEaRkEy') == 'probably') OK
-EXPECTED (video.canPlayType('video/webm; codecs="vp8"', 'com.example.invalid') == '') OK
-
-WebM video container with two valid codecs result in "probably".
-EXPECTED (video.canPlayType('video/webm; codecs="vp8, vorbis"') == 'probably') OK
-EXPECTED (video.canPlayType('video/webm; codecs="vp8, vorbis"', '') == 'probably') OK
-EXPECTED (video.canPlayType('video/webm; codecs="vp8, vorbis"', null) == 'probably') OK
-EXPECTED (video.canPlayType('video/webm; codecs="vp8, vorbis"', undefined) == 'probably') OK
-EXPECTED (video.canPlayType('video/webm; codecs="vp8, vorbis"', 'webkit-org.w3.clearkey') == 'probably') OK
-EXPECTED (video.canPlayType('video/webm; codecs="vp8, vorbis"', 'WeBkIt-OrG.W3.ClEaRkEy') == 'probably') OK
-EXPECTED (video.canPlayType('video/webm; codecs="vp8, vorbis"', 'com.example.invalid') == '') OK
-
-WebM video container with two valid codecs result in "probably" regardless of the order.
-EXPECTED (video.canPlayType('video/webm; codecs="vorbis, vp8"') == 'probably') OK
-EXPECTED (video.canPlayType('video/webm; codecs="vorbis, vp8"', '') == 'probably') OK
-EXPECTED (video.canPlayType('video/webm; codecs="vorbis, vp8"', null) == 'probably') OK
-EXPECTED (video.canPlayType('video/webm; codecs="vorbis, vp8"', undefined) == 'probably') OK
-EXPECTED (video.canPlayType('video/webm; codecs="vorbis, vp8"', 'webkit-org.w3.clearkey') == 'probably') OK
-EXPECTED (video.canPlayType('video/webm; codecs="vorbis, vp8"', 'WeBkIt-OrG.W3.ClEaRkEy') == 'probably') OK
-EXPECTED (video.canPlayType('video/webm; codecs="vorbis, vp8"', 'com.example.invalid') == '') OK
-
-WebM video container with an invalid codec results in "".
-EXPECTED (video.canPlayType('video/webm; codecs="1"') == '') OK
-EXPECTED (video.canPlayType('video/webm; codecs="1"', '') == '') OK
-EXPECTED (video.canPlayType('video/webm; codecs="1"', null) == '') OK
-EXPECTED (video.canPlayType('video/webm; codecs="1"', undefined) == '') OK
-EXPECTED (video.canPlayType('video/webm; codecs="1"', 'webkit-org.w3.clearkey') == '') OK
-EXPECTED (video.canPlayType('video/webm; codecs="1"', 'WeBkIt-OrG.W3.ClEaRkEy') == '') OK
-EXPECTED (video.canPlayType('video/webm; codecs="1"', 'com.example.invalid') == '') OK
-
-WebM video container with any invalid codec results in "".
-EXPECTED (video.canPlayType('video/webm; codecs="vp8, 1"') == '') OK
-EXPECTED (video.canPlayType('video/webm; codecs="vp8, 1"', '') == '') OK
-EXPECTED (video.canPlayType('video/webm; codecs="vp8, 1"', null) == '') OK
-EXPECTED (video.canPlayType('video/webm; codecs="vp8, 1"', undefined) == '') OK
-EXPECTED (video.canPlayType('video/webm; codecs="vp8, 1"', 'webkit-org.w3.clearkey') == '') OK
-EXPECTED (video.canPlayType('video/webm; codecs="vp8, 1"', 'WeBkIt-OrG.W3.ClEaRkEy') == '') OK
-EXPECTED (video.canPlayType('video/webm; codecs="vp8, 1"', 'com.example.invalid') == '') OK
-
-WebM video container with any invalid codec results in "" regardless of the order.
-EXPECTED (video.canPlayType('video/webm; codecs="1, vp8"') == '') OK
-EXPECTED (video.canPlayType('video/webm; codecs="1, vp8"', '') == '') OK
-EXPECTED (video.canPlayType('video/webm; codecs="1, vp8"', null) == '') OK
-EXPECTED (video.canPlayType('video/webm; codecs="1, vp8"', undefined) == '') OK
-EXPECTED (video.canPlayType('video/webm; codecs="1, vp8"', 'webkit-org.w3.clearkey') == '') OK
-EXPECTED (video.canPlayType('video/webm; codecs="1, vp8"', 'WeBkIt-OrG.W3.ClEaRkEy') == '') OK
-EXPECTED (video.canPlayType('video/webm; codecs="1, vp8"', 'com.example.invalid') == '') OK
-
-WebM audio container without a codec results in "maybe".
-EXPECTED (video.canPlayType('audio/webm') == 'maybe') OK
-EXPECTED (video.canPlayType('audio/webm', '') == 'maybe') OK
-EXPECTED (video.canPlayType('audio/webm', null) == 'maybe') OK
-EXPECTED (video.canPlayType('audio/webm', undefined) == 'maybe') OK
-EXPECTED (video.canPlayType('audio/webm', 'webkit-org.w3.clearkey') == 'maybe') OK
-EXPECTED (video.canPlayType('audio/webm', 'WeBkIt-OrG.W3.ClEaRkEy') == 'maybe') OK
-EXPECTED (video.canPlayType('audio/webm', 'com.example.invalid') == '') OK
-
-WebM audio container with a valid codec results in "probably".
-EXPECTED (video.canPlayType('audio/webm; codecs="vorbis"') == 'probably') OK
-EXPECTED (video.canPlayType('audio/webm; codecs="vorbis"', '') == 'probably') OK
-EXPECTED (video.canPlayType('audio/webm; codecs="vorbis"', null) == 'probably') OK
-EXPECTED (video.canPlayType('audio/webm; codecs="vorbis"', undefined) == 'probably') OK
-EXPECTED (video.canPlayType('audio/webm; codecs="vorbis"', 'webkit-org.w3.clearkey') == 'probably') OK
-EXPECTED (video.canPlayType('audio/webm; codecs="vorbis"', 'WeBkIt-OrG.W3.ClEaRkEy') == 'probably') OK
-EXPECTED (video.canPlayType('audio/webm; codecs="vorbis"', 'com.example.invalid') == '') OK
-
-WebM video container with a video codec results in "".
-EXPECTED (video.canPlayType('audio/webm; codecs="vp8"') == '') OK
-EXPECTED (video.canPlayType('audio/webm; codecs="vp8"', '') == '') OK
-EXPECTED (video.canPlayType('audio/webm; codecs="vp8"', null) == '') OK
-EXPECTED (video.canPlayType('audio/webm; codecs="vp8"', undefined) == '') OK
-EXPECTED (video.canPlayType('audio/webm; codecs="vp8"', 'webkit-org.w3.clearkey') == '') OK
-EXPECTED (video.canPlayType('audio/webm; codecs="vp8"', 'WeBkIt-OrG.W3.ClEaRkEy') == '') OK
-EXPECTED (video.canPlayType('audio/webm; codecs="vp8"', 'com.example.invalid') == '') OK
-
-Case does not matter (except for the codecs string).
-EXPECTED (video.canPlayType('ViDeO/WeBm; CoDeCs="vp8, vorbis"') == 'probably') OK
-EXPECTED (video.canPlayType('ViDeO/WeBm; CoDeCs="vp8, vorbis"', '') == 'probably') OK
-EXPECTED (video.canPlayType('ViDeO/WeBm; CoDeCs="vp8, vorbis"', null) == 'probably') OK
-EXPECTED (video.canPlayType('ViDeO/WeBm; CoDeCs="vp8, vorbis"', undefined) == 'probably') OK
-EXPECTED (video.canPlayType('ViDeO/WeBm; CoDeCs="vp8, vorbis"', 'webkit-org.w3.clearkey') == 'probably') OK
-EXPECTED (video.canPlayType('ViDeO/WeBm; CoDeCs="vp8, vorbis"', 'WeBkIt-OrG.W3.ClEaRkEy') == 'probably') OK
-EXPECTED (video.canPlayType('ViDeO/WeBm; CoDeCs="vp8, vorbis"', 'com.example.invalid') == '') OK
-
-The codecs string is case sensitive, so non-lower-case codecs result in "".
-EXPECTED (video.canPlayType('ViDeO/WeBm; CoDeCs="Vp8, VoRbIs"') == '') OK
-EXPECTED (video.canPlayType('ViDeO/WeBm; CoDeCs="Vp8, VoRbIs"', '') == '') OK
-EXPECTED (video.canPlayType('ViDeO/WeBm; CoDeCs="Vp8, VoRbIs"', null) == '') OK
-EXPECTED (video.canPlayType('ViDeO/WeBm; CoDeCs="Vp8, VoRbIs"', undefined) == '') OK
-EXPECTED (video.canPlayType('ViDeO/WeBm; CoDeCs="Vp8, VoRbIs"', 'webkit-org.w3.clearkey') == '') OK
-EXPECTED (video.canPlayType('ViDeO/WeBm; CoDeCs="Vp8, VoRbIs"', 'WeBkIt-OrG.W3.ClEaRkEy') == '') OK
-EXPECTED (video.canPlayType('ViDeO/WeBm; CoDeCs="Vp8, VoRbIs"', 'com.example.invalid') == '') OK
-END OF TEST
-
</del></span></pre></div>
<a id="trunkLayoutTestsmediaencryptedmediaencryptedmediacanplaytypewebmhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/media/encrypted-media/encrypted-media-can-play-type-webm.html (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/encrypted-media/encrypted-media-can-play-type-webm.html 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/LayoutTests/media/encrypted-media/encrypted-media-can-play-type-webm.html 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -1,124 +0,0 @@
</span><del>-<!doctype html>
-<html lang="en">
- <head>
- </head>
- <body>
- <video></video>
- <p>Test Encrypted Media extension of HTMLMediaElement <em>canPlayType()</em> method for WebM types.</p>
-
- <script src=../video-test.js></script>
- <script>
- video = mediaElement = document.getElementsByTagName('video')[0];
-
- consoleWrite("WebM video container without a codec results in \"maybe\".");
- testExpected("video.canPlayType('video/webm')", "maybe");
- testExpected("video.canPlayType('video/webm', '')", "maybe");
- testExpected("video.canPlayType('video/webm', null)", "maybe");
- testExpected("video.canPlayType('video/webm', undefined)", "maybe");
- testExpected("video.canPlayType('video/webm', 'webkit-org.w3.clearkey')", "maybe");
- testExpected("video.canPlayType('video/webm', 'WeBkIt-OrG.W3.ClEaRkEy')", "maybe");
- testExpected("video.canPlayType('video/webm', 'com.example.invalid')", "");
-
- consoleWrite("<br>WebM video container with a valid codec results in \"probably\".");
- testExpected("video.canPlayType('video/webm; codecs=\"vp8\"')", "probably");
- testExpected("video.canPlayType('video/webm; codecs=\"vp8\"', '')", "probably");
- testExpected("video.canPlayType('video/webm; codecs=\"vp8\"', null)", "probably");
- testExpected("video.canPlayType('video/webm; codecs=\"vp8\"', undefined)", "probably");
- testExpected("video.canPlayType('video/webm; codecs=\"vp8\"', 'webkit-org.w3.clearkey')", "probably");
- testExpected("video.canPlayType('video/webm; codecs=\"vp8\"', 'WeBkIt-OrG.W3.ClEaRkEy')", "probably");
- testExpected("video.canPlayType('video/webm; codecs=\"vp8\"', 'com.example.invalid')", "");
-
- consoleWrite("<br>WebM video container with two valid codecs result in \"probably\".");
- testExpected("video.canPlayType('video/webm; codecs=\"vp8, vorbis\"')", "probably");
- testExpected("video.canPlayType('video/webm; codecs=\"vp8, vorbis\"', '')", "probably");
- testExpected("video.canPlayType('video/webm; codecs=\"vp8, vorbis\"', null)", "probably");
- testExpected("video.canPlayType('video/webm; codecs=\"vp8, vorbis\"', undefined)", "probably");
- testExpected("video.canPlayType('video/webm; codecs=\"vp8, vorbis\"', 'webkit-org.w3.clearkey')", "probably");
- testExpected("video.canPlayType('video/webm; codecs=\"vp8, vorbis\"', 'WeBkIt-OrG.W3.ClEaRkEy')", "probably");
- testExpected("video.canPlayType('video/webm; codecs=\"vp8, vorbis\"', 'com.example.invalid')", "");
-
- consoleWrite("<br>WebM video container with two valid codecs result in \"probably\" regardless of the order.");
- testExpected("video.canPlayType('video/webm; codecs=\"vorbis, vp8\"')", "probably");
- testExpected("video.canPlayType('video/webm; codecs=\"vorbis, vp8\"', '')", "probably");
- testExpected("video.canPlayType('video/webm; codecs=\"vorbis, vp8\"', null)", "probably");
- testExpected("video.canPlayType('video/webm; codecs=\"vorbis, vp8\"', undefined)", "probably");
- testExpected("video.canPlayType('video/webm; codecs=\"vorbis, vp8\"', 'webkit-org.w3.clearkey')", "probably");
- testExpected("video.canPlayType('video/webm; codecs=\"vorbis, vp8\"', 'WeBkIt-OrG.W3.ClEaRkEy')", "probably");
- testExpected("video.canPlayType('video/webm; codecs=\"vorbis, vp8\"', 'com.example.invalid')", "");
-
- consoleWrite("<br>WebM video container with an invalid codec results in \"\".");
- testExpected("video.canPlayType('video/webm; codecs=\"1\"')", "");
- testExpected("video.canPlayType('video/webm; codecs=\"1\"', '')", "");
- testExpected("video.canPlayType('video/webm; codecs=\"1\"', null)", "");
- testExpected("video.canPlayType('video/webm; codecs=\"1\"', undefined)", "");
- testExpected("video.canPlayType('video/webm; codecs=\"1\"', 'webkit-org.w3.clearkey')", "");
- testExpected("video.canPlayType('video/webm; codecs=\"1\"', 'WeBkIt-OrG.W3.ClEaRkEy')", "");
- testExpected("video.canPlayType('video/webm; codecs=\"1\"', 'com.example.invalid')", "");
-
- consoleWrite("<br>WebM video container with any invalid codec results in \"\".");
- testExpected("video.canPlayType('video/webm; codecs=\"vp8, 1\"')", "");
- testExpected("video.canPlayType('video/webm; codecs=\"vp8, 1\"', '')", "");
- testExpected("video.canPlayType('video/webm; codecs=\"vp8, 1\"', null)", "");
- testExpected("video.canPlayType('video/webm; codecs=\"vp8, 1\"', undefined)", "");
- testExpected("video.canPlayType('video/webm; codecs=\"vp8, 1\"', 'webkit-org.w3.clearkey')", "");
- testExpected("video.canPlayType('video/webm; codecs=\"vp8, 1\"', 'WeBkIt-OrG.W3.ClEaRkEy')", "");
- testExpected("video.canPlayType('video/webm; codecs=\"vp8, 1\"', 'com.example.invalid')", "");
-
- consoleWrite("<br>WebM video container with any invalid codec results in \"\" regardless of the order.");
- testExpected("video.canPlayType('video/webm; codecs=\"1, vp8\"')", "");
- testExpected("video.canPlayType('video/webm; codecs=\"1, vp8\"', '')", "");
- testExpected("video.canPlayType('video/webm; codecs=\"1, vp8\"', null)", "");
- testExpected("video.canPlayType('video/webm; codecs=\"1, vp8\"', undefined)", "");
- testExpected("video.canPlayType('video/webm; codecs=\"1, vp8\"', 'webkit-org.w3.clearkey')", "");
- testExpected("video.canPlayType('video/webm; codecs=\"1, vp8\"', 'WeBkIt-OrG.W3.ClEaRkEy')", "");
- testExpected("video.canPlayType('video/webm; codecs=\"1, vp8\"', 'com.example.invalid')", "");
-
- consoleWrite("<br>WebM audio container without a codec results in \"maybe\".");
- testExpected("video.canPlayType('audio/webm')", "maybe");
- testExpected("video.canPlayType('audio/webm', '')", "maybe");
- testExpected("video.canPlayType('audio/webm', null)", "maybe");
- testExpected("video.canPlayType('audio/webm', undefined)", "maybe");
- testExpected("video.canPlayType('audio/webm', 'webkit-org.w3.clearkey')", "maybe");
- testExpected("video.canPlayType('audio/webm', 'WeBkIt-OrG.W3.ClEaRkEy')", "maybe");
- testExpected("video.canPlayType('audio/webm', 'com.example.invalid')", "");
-
- consoleWrite("<br>WebM audio container with a valid codec results in \"probably\".");
- testExpected("video.canPlayType('audio/webm; codecs=\"vorbis\"')", "probably");
- testExpected("video.canPlayType('audio/webm; codecs=\"vorbis\"', '')", "probably");
- testExpected("video.canPlayType('audio/webm; codecs=\"vorbis\"', null)", "probably");
- testExpected("video.canPlayType('audio/webm; codecs=\"vorbis\"', undefined)", "probably");
- testExpected("video.canPlayType('audio/webm; codecs=\"vorbis\"', 'webkit-org.w3.clearkey')", "probably");
- testExpected("video.canPlayType('audio/webm; codecs=\"vorbis\"', 'WeBkIt-OrG.W3.ClEaRkEy')", "probably");
- testExpected("video.canPlayType('audio/webm; codecs=\"vorbis\"', 'com.example.invalid')", "");
-
- consoleWrite("<br>WebM video container with a video codec results in \"\".");
- testExpected("video.canPlayType('audio/webm; codecs=\"vp8\"')", "");
- testExpected("video.canPlayType('audio/webm; codecs=\"vp8\"', '')", "");
- testExpected("video.canPlayType('audio/webm; codecs=\"vp8\"', null)", "");
- testExpected("video.canPlayType('audio/webm; codecs=\"vp8\"', undefined)", "");
- testExpected("video.canPlayType('audio/webm; codecs=\"vp8\"', 'webkit-org.w3.clearkey')", "");
- testExpected("video.canPlayType('audio/webm; codecs=\"vp8\"', 'WeBkIt-OrG.W3.ClEaRkEy')", "");
- testExpected("video.canPlayType('audio/webm; codecs=\"vp8\"', 'com.example.invalid')", "");
-
- consoleWrite("<br>Case does not matter (except for the codecs string).");
- testExpected("video.canPlayType('ViDeO/WeBm; CoDeCs=\"vp8, vorbis\"')", "probably");
- testExpected("video.canPlayType('ViDeO/WeBm; CoDeCs=\"vp8, vorbis\"', '')", "probably");
- testExpected("video.canPlayType('ViDeO/WeBm; CoDeCs=\"vp8, vorbis\"', null)", "probably");
- testExpected("video.canPlayType('ViDeO/WeBm; CoDeCs=\"vp8, vorbis\"', undefined)", "probably");
- testExpected("video.canPlayType('ViDeO/WeBm; CoDeCs=\"vp8, vorbis\"', 'webkit-org.w3.clearkey')", "probably");
- testExpected("video.canPlayType('ViDeO/WeBm; CoDeCs=\"vp8, vorbis\"', 'WeBkIt-OrG.W3.ClEaRkEy')", "probably");
- testExpected("video.canPlayType('ViDeO/WeBm; CoDeCs=\"vp8, vorbis\"', 'com.example.invalid')", "");
-
- consoleWrite("<br>The codecs string is case sensitive, so non-lower-case codecs result in \"\".");
- testExpected("video.canPlayType('ViDeO/WeBm; CoDeCs=\"Vp8, VoRbIs\"')", "");
- testExpected("video.canPlayType('ViDeO/WeBm; CoDeCs=\"Vp8, VoRbIs\"', '')", "");
- testExpected("video.canPlayType('ViDeO/WeBm; CoDeCs=\"Vp8, VoRbIs\"', null)", "");
- testExpected("video.canPlayType('ViDeO/WeBm; CoDeCs=\"Vp8, VoRbIs\"', undefined)", "");
- testExpected("video.canPlayType('ViDeO/WeBm; CoDeCs=\"Vp8, VoRbIs\"', 'webkit-org.w3.clearkey')", "");
- testExpected("video.canPlayType('ViDeO/WeBm; CoDeCs=\"Vp8, VoRbIs\"', 'WeBkIt-OrG.W3.ClEaRkEy')", "");
- testExpected("video.canPlayType('ViDeO/WeBm; CoDeCs=\"Vp8, VoRbIs\"', 'com.example.invalid')", "");
-
- endTest();
- </script>
- </body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsmediaencryptedmediaencryptedmediacanplaytypehtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/media/encrypted-media/encrypted-media-can-play-type.html (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/encrypted-media/encrypted-media-can-play-type.html 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/LayoutTests/media/encrypted-media/encrypted-media-can-play-type.html 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -1,96 +0,0 @@
</span><del>-<!doctype html>
-<html lang="en">
- <head>
- </head>
- <body>
- <video></video>
- <p>Test Encrypted Media extension of HTMLMediaElement <em>canPlayType()</em> method.</p>
- <p>The test is designed to pass with any implementation regardless of supported media types and relies on the expected log to detect the expected results for some types.
- To get sufficient coverage, it is important that an implementation support clearkey encryption of at least one of the types below.</p>
-
- <script src=../video-test.js></script>
- <script>
- video = mediaElement = document.getElementsByTagName('video')[0];
-
- consoleWrite("Always return the empty string for no type.");
- testException("video.canPlayType()", "'TypeError: Not enough arguments'");
-
- consoleWrite("<br>Always return the empty string for an empty type.");
- testExpected("video.canPlayType('')", "");
- testExpected("video.canPlayType('', '')", "");
- testExpected("video.canPlayType('', null)", "");
- testExpected("video.canPlayType('', undefined)", "");
- testExpected("video.canPlayType('', 'webkit-org.w3.clearkey')", "");
- testExpected("video.canPlayType('', 'WeBkIt-OrG.W3.ClEaRkEy')", "");
- testExpected("video.canPlayType('', 'com.example.invalid')", "");
-
- consoleWrite("<br>Always return the empty string for when no container is specified.");
- testExpected("video.canPlayType('video/')", "");
- testExpected("video.canPlayType('video/', '')", "");
- testExpected("video.canPlayType('video/', null)", "");
- testExpected("video.canPlayType('video/', undefined)", "");
- testExpected("video.canPlayType('video/', 'webkit-org.w3.clearkey')", "");
- testExpected("video.canPlayType('video/', 'WeBkIt-OrG.W3.ClEaRkEy')", "");
- testExpected("video.canPlayType('video/', 'com.example.invalid')", "");
-
- consoleWrite("<br>Always return the empty string for an unsupported container.");
- testExpected("video.canPlayType('video/blahblah')", "");
- testExpected("video.canPlayType('video/blahblah', '')", "");
- testExpected("video.canPlayType('video/blahblah', null)", "");
- testExpected("video.canPlayType('video/blahblah', undefined)", "");
- testExpected("video.canPlayType('video/blahblah', 'webkit-org.w3.clearkey')", "");
- testExpected("video.canPlayType('video/blahblah', 'WeBkIt-OrG.W3.ClEaRkEy')", "");
- testExpected("video.canPlayType('video/blahblah', 'com.example.invalid')", "");
-
- consoleWrite("<br>Empty key system parameters should not affect the result of video/mp4 types.");
- var mp4Result = video.canPlayType('video/mp4; Codecs=\"avc1.4D400C\"');
- var mp4ResultLogString = "Result of video.canPlayType('video/mp4; Codecs=\"avc1.4D400C\"'): '" + mp4Result + "'";
- consoleWrite(mp4ResultLogString);
- testExpected("video.canPlayType('video/mp4; Codecs=\"avc1.4D400C\"', '')", mp4Result);
- testExpected("video.canPlayType('video/mp4; Codecs=\"avc1.4D400C\"', null)", mp4Result);
- testExpected("video.canPlayType('video/mp4; Codecs=\"avc1.4D400C\"', undefined)", mp4Result);
- consoleWrite("There are currently no implementations supporting encryption of video/mp4.");
- testExpected("video.canPlayType('video/mp4; Codecs=\"avc1.4D400C\"', 'webkit-org.w3.clearkey')", "");
- testExpected("video.canPlayType('video/mp4; Codecs=\"avc1.4D400C\"', 'WeBkIt-OrG.W3.ClEaRkEy')", "");
- testExpected("video.canPlayType('video/mp4; Codecs=\"avc1.4D400C\"', 'com.example.invalid')", "");
-
- consoleWrite("<br>Empty key system parameters should not affect the result of audio/mpeg types.");
- var mpegResult = video.canPlayType('audio/mpeg');
- var mpegResultLogString = "Result of video.canPlayType('audio/mpeg'): '" + mpegResult + "'";
- consoleWrite(mpegResultLogString);
- testExpected("video.canPlayType('audio/mpeg', '')", mpegResult);
- testExpected("video.canPlayType('audio/mpeg', null)", mpegResult);
- testExpected("video.canPlayType('audio/mpeg', undefined)", mpegResult);
- consoleWrite("There are currently no implementations supporting encryption of audio/mpeg.");
- testExpected("video.canPlayType('audio/mpeg', 'webkit-org.w3.clearkey')", "");
- testExpected("video.canPlayType('audio/mpeg', 'WeBkIt-OrG.W3.ClEaRkEy')", "");
- testExpected("video.canPlayType('audio/mpeg', 'com.example.invalid')", "");
-
- consoleWrite("<br>Empty key system parameters should not affect the result of audio/wav types.");
- var wavResult = video.canPlayType('audio/wav');
- var wavResultLogString = "Result of video.canPlayType('audio/wav'): '" + wavResult + "'";
- consoleWrite(wavResultLogString);
- testExpected("video.canPlayType('audio/wav', '')", wavResult);
- testExpected("video.canPlayType('audio/wav', null)", wavResult);
- testExpected("video.canPlayType('audio/wav', undefined)", wavResult);
- consoleWrite("There are currently no implementations supporting encryption of audio/wav.");
- testExpected("video.canPlayType('audio/wav', 'webkit-org.w3.clearkey')", "");
- testExpected("video.canPlayType('audio/wav', 'WeBkIt-OrG.W3.ClEaRkEy')", "");
- testExpected("video.canPlayType('audio/wav', 'com.example.invalid')", "");
-
- consoleWrite("<br>Empty key system parameters should not affect the result of video/webm types.");
- var webmResult = video.canPlayType('video/webm');
- var webmResultLogString = "Result of video.canPlayType('video/webm'): '" + webmResult + "'";
- consoleWrite(webmResultLogString);
- testExpected("video.canPlayType('video/webm', '')", webmResult);
- testExpected("video.canPlayType('video/webm', null)", webmResult);
- testExpected("video.canPlayType('video/webm', undefined)", webmResult);
- consoleWrite("All implementations that support WebM and Encrypted Media support encrypted WebM.");
- testExpected("video.canPlayType('video/webm', 'webkit-org.w3.clearkey')", webmResult);
- testExpected("video.canPlayType('video/webm', 'WeBkIt-OrG.W3.ClEaRkEy')", webmResult);
- testExpected("video.canPlayType('video/webm', 'com.example.invalid')", "");
-
- endTest();
- </script>
- </body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacfasteventsconstructorsmediakeyeventconstructorexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac/fast/events/constructors/media-key-event-constructor-expected.txt (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/events/constructors/media-key-event-constructor-expected.txt 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/LayoutTests/platform/mac/fast/events/constructors/media-key-event-constructor-expected.txt 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -1,102 +0,0 @@
</span><del>-This tests the constructor for the MediaKeyEvent DOM class.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-
-*** No initializer passed ***
-PASS new MediaKeyEvent('MediaKeyEvent').bubbles is false
-PASS new MediaKeyEvent('MediaKeyEvent').cancelable is false
-PASS new MediaKeyEvent('MediaKeyEvent').keySystem is ""
-PASS new MediaKeyEvent('MediaKeyEvent').sessionId is ""
-PASS new MediaKeyEvent('MediaKeyEvent').initData is null
-PASS new MediaKeyEvent('MediaKeyEvent').message is null
-PASS new MediaKeyEvent('MediaKeyEvent').defaultURL is ""
-PASS new MediaKeyEvent('MediaKeyEvent').errorCode is null
-PASS new MediaKeyEvent('MediaKeyEvent').systemCode is 0
-
-*** Bubbles and cancelable true, other members are missing ***
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true }).bubbles is true
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true }).cancelable is true
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true }).keySystem is ""
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true }).sessionId is ""
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true }).initData is null
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true }).message is null
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true }).defaultURL is ""
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true }).errorCode is null
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true }).systemCode is 0
-
-*** Bubbles and cancelable true, invalid other members ***
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: undefined, sessionId: undefined, initData: Uint8Array, message: Uint8Array, defaultURL: undefined, errorCode: MediaKeyError, systemCode: undefined }).bubbles is true
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: undefined, sessionId: undefined, initData: Uint8Array, message: Uint8Array, defaultURL: undefined, errorCode: MediaKeyError, systemCode: undefined }).cancelable is true
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: undefined, sessionId: undefined, initData: Uint8Array, message: Uint8Array, defaultURL: undefined, errorCode: MediaKeyError, systemCode: undefined }).keySystem is "undefined"
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: undefined, sessionId: undefined, initData: Uint8Array, message: Uint8Array, defaultURL: undefined, errorCode: MediaKeyError, systemCode: undefined }).sessionId is "undefined"
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: undefined, sessionId: undefined, initData: Uint8Array, message: Uint8Array, defaultURL: undefined, errorCode: MediaKeyError, systemCode: undefined }).initData is null
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: undefined, sessionId: undefined, initData: Uint8Array, message: Uint8Array, defaultURL: undefined, errorCode: MediaKeyError, systemCode: undefined }).message is null
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: undefined, sessionId: undefined, initData: Uint8Array, message: Uint8Array, defaultURL: undefined, errorCode: MediaKeyError, systemCode: undefined }).defaultURL is "undefined"
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: undefined, sessionId: undefined, initData: Uint8Array, message: Uint8Array, defaultURL: undefined, errorCode: MediaKeyError, systemCode: undefined }).errorCode is null
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: undefined, sessionId: undefined, initData: Uint8Array, message: Uint8Array, defaultURL: undefined, errorCode: MediaKeyError, systemCode: undefined }).systemCode is 0
-
-*** Initialize 'keySystem' with a invalid values ***
-PASS new MediaKeyEvent('MediaKeyEvent', { keySystem: emptyObject }).keySystem is "[object Object]"
-PASS new MediaKeyEvent('MediaKeyEvent', { keySystem: document }).keySystem is "[object HTMLDocument]"
-
-*** Initialize 'sessionId' with a invalid values ***
-PASS new MediaKeyEvent('MediaKeyEvent', { sessionId: emptyObject }).sessionId is "[object Object]"
-PASS new MediaKeyEvent('MediaKeyEvent', { sessionId: document }).sessionId is "[object HTMLDocument]"
-
-*** Initialize 'initData' with a invalid values ***
-PASS new MediaKeyEvent('MediaKeyEvent', { initData: 10 }).initData is null
-PASS new MediaKeyEvent('MediaKeyEvent', { initData: 'string' }).initData is null
-PASS new MediaKeyEvent('MediaKeyEvent', { initData: emptyObject }).initData is null
-PASS new MediaKeyEvent('MediaKeyEvent', { initData: document }).initData is null
-
-*** Initialize 'message' with a invalid values ***
-PASS new MediaKeyEvent('MediaKeyEvent', { message: 10 }).message is null
-PASS new MediaKeyEvent('MediaKeyEvent', { message: 'string' }).message is null
-PASS new MediaKeyEvent('MediaKeyEvent', { message: emptyObject }).message is null
-PASS new MediaKeyEvent('MediaKeyEvent', { message: document }).message is null
-
-*** Initialize 'defaultURL' with a invalid values ***
-PASS new MediaKeyEvent('MediaKeyEvent', { defaultURL: emptyObject }).defaultURL is "[object Object]"
-PASS new MediaKeyEvent('MediaKeyEvent', { defaultURL: document }).defaultURL is "[object HTMLDocument]"
-
-*** Initialize 'errorCode' with a invalid values ***
-PASS new MediaKeyEvent('MediaKeyEvent', { errorCode: 10 }).errorCode is null
-PASS new MediaKeyEvent('MediaKeyEvent', { errorCode: 'string' }).errorCode is null
-PASS new MediaKeyEvent('MediaKeyEvent', { errorCode: emptyObject }).errorCode is null
-PASS new MediaKeyEvent('MediaKeyEvent', { errorCode: document }).errorCode is null
-
-*** Initialize 'systemCode' with a invalid values ***
-PASS new MediaKeyEvent('MediaKeyEvent', { systemCode: 'string' }).systemCode is 0
-PASS new MediaKeyEvent('MediaKeyEvent', { systemCode: emptyObject }).systemCode is 0
-PASS new MediaKeyEvent('MediaKeyEvent', { systemCode: document }).systemCode is 0
-
-*** Bubbles and cancelable true, valid other members ***
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).bubbles is true
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).cancelable is true
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).keySystem is "keySystem"
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).sessionId is "sessionId"
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).initData is initDataArray
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).message is messageArray
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).defaultURL is "defaultURL"
-FAIL new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).errorCode should be [object MediaKeyErrorConstructor]. Was null.
-FAIL new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).errorCode.code should be 1. Threw exception TypeError: 'null' is not an object (near '...de: 123 }).errorCode.code...')
-PASS new MediaKeyEvent('MediaKeyEvent', { bubbles: true, cancelable: true, keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).systemCode is 123
-
-*** Initialize with valid members ***
-FAIL new MediaKeyEvent('MediaKeyEvent', { keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).bubbles should be true. Was false.
-FAIL new MediaKeyEvent('MediaKeyEvent', { keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).cancelable should be true. Was false.
-PASS new MediaKeyEvent('MediaKeyEvent', { keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).keySystem is "keySystem"
-PASS new MediaKeyEvent('MediaKeyEvent', { keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).sessionId is "sessionId"
-PASS new MediaKeyEvent('MediaKeyEvent', { keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).initData is initDataArray
-PASS new MediaKeyEvent('MediaKeyEvent', { keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).message is messageArray
-PASS new MediaKeyEvent('MediaKeyEvent', { keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).defaultURL is "defaultURL"
-FAIL new MediaKeyEvent('MediaKeyEvent', { keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).errorCode should be [object MediaKeyErrorConstructor]. Was null.
-FAIL new MediaKeyEvent('MediaKeyEvent', { keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).errorCode.code should be 1. Threw exception TypeError: 'null' is not an object (near '...de: 123 }).errorCode.code...')
-PASS new MediaKeyEvent('MediaKeyEvent', { keySystem: 'keySystem', sessionId: 'sessionId', initData: initDataArray, message: messageArray, defaultURL: 'defaultURL', errorCode: errorObject, systemCode: 123 }).systemCode is 123
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacjsdomglobalconstructorsattributesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -963,11 +963,6 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'MediaError').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'MediaError').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'MediaError').configurable is true
</span><del>-PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyEvent').value is MediaKeyEvent
-PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyEvent').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyEvent').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyEvent').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyEvent').configurable is true
</del><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyNeededEvent').value is MediaKeyNeededEvent
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyNeededEvent').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyNeededEvent').hasOwnProperty('set') is false
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1jsdomglobalconstructorsattributesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/js/dom/global-constructors-attributes-expected.txt (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/js/dom/global-constructors-attributes-expected.txt 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/LayoutTests/platform/mac-wk1/js/dom/global-constructors-attributes-expected.txt 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -948,11 +948,6 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'MediaError').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'MediaError').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'MediaError').configurable is true
</span><del>-PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyEvent').value is MediaKeyEvent
-PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyEvent').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyEvent').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyEvent').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyEvent').configurable is true
</del><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyNeededEvent').value is MediaKeyNeededEvent
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyNeededEvent').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyNeededEvent').hasOwnProperty('set') is false
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacyosemitejsdomglobalconstructorsattributesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/LayoutTests/platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -963,11 +963,6 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'MediaError').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'MediaError').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'MediaError').configurable is true
</span><del>-PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyEvent').value is MediaKeyEvent
-PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyEvent').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyEvent').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyEvent').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyEvent').configurable is true
</del><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyNeededEvent').value is MediaKeyNeededEvent
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyNeededEvent').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'MediaKeyNeededEvent').hasOwnProperty('set') is false
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-09-27 Jer Noble <jer.noble@apple.com>
+
+ Remove deprecated ENCRYPTED_MEDIA implementation.
+ https://bugs.webkit.org/show_bug.cgi?id=161010
+
+ Reviewed by Eric Carlson.
+
+ Remove ENABLE_ENCRYPTED_MEDIA.
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2016-09-27 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Install binaries to pkglibexecdir rather than bindir
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -75,7 +75,6 @@
</span><span class="cx"> ENABLE_DETAILS_ELEMENT = ENABLE_DETAILS_ELEMENT;
</span><span class="cx"> ENABLE_DEVICE_ORIENTATION[sdk=iphone*] = ENABLE_DEVICE_ORIENTATION;
</span><span class="cx"> ENABLE_DOM4_EVENTS_CONSTRUCTOR = ENABLE_DOM4_EVENTS_CONSTRUCTOR;
</span><del>-ENABLE_ENCRYPTED_MEDIA[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA;
</del><span class="cx"> ENABLE_ENCRYPTED_MEDIA_V2[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA_V2;
</span><span class="cx"> ENABLE_FETCH_API = ENABLE_FETCH_API;
</span><span class="cx"> ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
</span><span class="lines">@@ -201,4 +200,4 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_CUSTOM_ELEMENTS = ENABLE_CUSTOM_ELEMENTS;
</span><span class="cx">
</span><del>-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_ELEMENTS) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRU
CTOR) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ES6_MODULES) $(ENABLE_ES2017_ASYNCFUNCTION_SYNTAX) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT)
$(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY)
$(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT);
</del><ins>+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_ELEMENTS) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUC
TOR) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_ES6_MODULES) $(ENABLE_ES2017_ASYNCFUNCTION_SYNTAX) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(
ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENA
BLE_WEB_TIMING) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT);
</ins></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Source/WTF/ChangeLog 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-09-27 Jer Noble <jer.noble@apple.com>
+
+ Remove deprecated ENCRYPTED_MEDIA implementation.
+ https://bugs.webkit.org/show_bug.cgi?id=161010
+
+ Reviewed by Eric Carlson.
+
+ Remove ENABLE_ENCRYPTED_MEDIA.
+
+ * wtf/FeatureDefines.h:
+
</ins><span class="cx"> 2016-09-27 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> [Fetch API] Use Ref<const T> in FetchBody::m_data variant
</span></span></pre></div>
<a id="trunkSourceWTFwtfFeatureDefinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FeatureDefines.h (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FeatureDefines.h 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Source/WTF/wtf/FeatureDefines.h 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -177,9 +177,6 @@
</span><span class="cx"> #define ENABLE_DASHBOARD_SUPPORT 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !defined(ENABLE_ENCRYPTED_MEDIA)
-#define ENABLE_ENCRYPTED_MEDIA 1
-#endif
</del><span class="cx"> #if !defined(ENABLE_ENCRYPTED_MEDIA_V2)
</span><span class="cx"> #define ENABLE_ENCRYPTED_MEDIA_V2 1
</span><span class="cx"> #endif
</span><span class="lines">@@ -436,10 +433,6 @@
</span><span class="cx"> #define ENABLE_DRAG_SUPPORT 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !defined(ENABLE_ENCRYPTED_MEDIA)
-#define ENABLE_ENCRYPTED_MEDIA 0
-#endif
-
</del><span class="cx"> #if !defined(ENABLE_ENCRYPTED_MEDIA_V2)
</span><span class="cx"> #define ENABLE_ENCRYPTED_MEDIA_V2 0
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -2983,7 +2983,7 @@
</span><span class="cx"> JavaScriptCore${DEBUG_SUFFIX}
</span><span class="cx"> )
</span><span class="cx">
</span><del>-if (ENABLE_ENCRYPTED_MEDIA OR ENABLE_ENCRYPTED_MEDIA_V2)
</del><ins>+if (ENABLE_ENCRYPTED_MEDIA_V2)
</ins><span class="cx"> list(APPEND WebCore_SOURCES
</span><span class="cx"> Modules/encryptedmedia/CDM.cpp
</span><span class="cx"> Modules/encryptedmedia/CDMPrivateClearKey.cpp
</span><span class="lines">@@ -2993,8 +2993,6 @@
</span><span class="cx"> Modules/encryptedmedia/MediaKeyNeededEvent.cpp
</span><span class="cx"> Modules/encryptedmedia/MediaKeySession.cpp
</span><span class="cx"> Modules/encryptedmedia/MediaKeys.cpp
</span><del>-
- html/MediaKeyEvent.cpp
</del><span class="cx"> )
</span><span class="cx"> list(APPEND WebCoreTestSupport_SOURCES
</span><span class="cx"> testing/MockCDM.cpp
</span><span class="lines">@@ -3006,7 +3004,6 @@
</span><span class="cx"> Modules/encryptedmedia/MediaKeys.idl
</span><span class="cx">
</span><span class="cx"> html/MediaKeyError.idl
</span><del>- html/MediaKeyEvent.idl
</del><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Source/WebCore/ChangeLog 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -1,3 +1,79 @@
</span><ins>+2016-09-27 Jer Noble <jer.noble@apple.com>
+
+ Remove deprecated ENCRYPTED_MEDIA implementation.
+ https://bugs.webkit.org/show_bug.cgi?id=161010
+
+ Reviewed by Eric Carlson.
+
+ Remove all references to the deprecated ENABLE_ENCRYPTED_MEDIA (leaving in place
+ the soon-to-be deprecated ENABLE_ENCRYPTED_MEDIA_V2).
+
+ * CMakeLists.txt:
+ * Configurations/FeatureDefines.xcconfig:
+ * DerivedSources.make:
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/objc/DOMHTMLMediaElement.h:
+ * bindings/objc/DOMHTMLMediaElement.mm:
+ (-[DOMHTMLMediaElement canPlayType:]):
+ (-[DOMHTMLMediaElement canPlayType:keySystem:]): Deleted.
+ * bindings/js/JSDictionary.cpp:
+ * bindings/js/JSDictionary.h:
+ * dom/Element.idl:
+ * dom/EventNames.in:
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::selectNextSourceChild):
+ (WebCore::exceptionCodeForMediaKeyException): Deleted.
+ (WebCore::HTMLMediaElement::canPlayType): Deleted.
+ (WebCore::HTMLMediaElement::mediaPlayerKeyAdded): Deleted.
+ (WebCore::HTMLMediaElement::mediaPlayerKeyError): Deleted.
+ (WebCore::HTMLMediaElement::mediaPlayerKeyMessage): Deleted.
+ (WebCore::HTMLMediaElement::mediaPlayerKeyNeeded): Deleted.
+ * html/HTMLMediaElement.h:
+ * html/HTMLMediaElement.idl:
+ * html/MediaError.h:
+ * html/MediaError.idl:
+ * html/MediaKeyError.h:
+ * html/MediaKeyError.idl:
+ * html/MediaKeyEvent.cpp: Removed.
+ (WebCore::MediaKeyEvent::MediaKeyEvent): Deleted.
+ (WebCore::MediaKeyEvent::~MediaKeyEvent): Deleted.
+ (WebCore::MediaKeyEvent::eventInterface): Deleted.
+ * html/MediaKeyEvent.h: Removed.
+ * html/MediaKeyEvent.idl: Removed.
+ * platform/graphics/MediaPlayer.cpp:
+ (WebCore::MediaPlayer::nextBestMediaEngine):
+ (WebCore::MediaPlayer::generateKeyRequest): Deleted.
+ (WebCore::MediaPlayer::addKey): Deleted.
+ (WebCore::MediaPlayer::cancelKeyRequest): Deleted.
+ (WebCore::MediaPlayer::keyAdded): Deleted.
+ (WebCore::MediaPlayer::keyError): Deleted.
+ (WebCore::MediaPlayer::keyMessage): Deleted.
+ (WebCore::MediaPlayer::keyNeeded): Deleted.
+ * platform/graphics/MediaPlayer.h:
+ (WebCore::MediaPlayerClient::mediaPlayerKeyAdded): Deleted.
+ (WebCore::MediaPlayerClient::mediaPlayerKeyError): Deleted.
+ (WebCore::MediaPlayerClient::mediaPlayerKeyMessage): Deleted.
+ (WebCore::MediaPlayerClient::mediaPlayerKeyNeeded): Deleted.
+ * platform/graphics/MediaPlayerPrivate.h:
+ (WebCore::MediaPlayerPrivateInterface::addKey): Deleted.
+ (WebCore::MediaPlayerPrivateInterface::generateKeyRequest): Deleted.
+ (WebCore::MediaPlayerPrivateInterface::cancelKeyRequest): Deleted.
+ * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
+ * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
+ * platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm:
+ (WebCore::CDMSessionAVContentKeySession::update):
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::supportsKeySystem):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::shouldWaitForLoadingOfResource):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::supportsType): Deleted.
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::generateKeyRequest): Deleted.
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::addKey): Deleted.
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::cancelKeyRequest): Deleted.
+ * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
+ (WebCore::MediaPlayerPrivateQTKit::supportsType): Deleted.
+ * testing/MockCDM.h:
+
</ins><span class="cx"> 2016-09-27 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> [Fetch API] Use Ref<const T> in FetchBody::m_data variant
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -75,7 +75,6 @@
</span><span class="cx"> ENABLE_DETAILS_ELEMENT = ENABLE_DETAILS_ELEMENT;
</span><span class="cx"> ENABLE_DEVICE_ORIENTATION[sdk=iphone*] = ENABLE_DEVICE_ORIENTATION;
</span><span class="cx"> ENABLE_DOM4_EVENTS_CONSTRUCTOR = ENABLE_DOM4_EVENTS_CONSTRUCTOR;
</span><del>-ENABLE_ENCRYPTED_MEDIA[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA;
</del><span class="cx"> ENABLE_ENCRYPTED_MEDIA_V2[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA_V2;
</span><span class="cx"> ENABLE_FETCH_API = ENABLE_FETCH_API;
</span><span class="cx"> ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
</span><span class="lines">@@ -201,4 +200,4 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_CUSTOM_ELEMENTS = ENABLE_CUSTOM_ELEMENTS;
</span><span class="cx">
</span><del>-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_ELEMENTS) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRU
CTOR) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ES6_MODULES) $(ENABLE_ES2017_ASYNCFUNCTION_SYNTAX) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT)
$(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY)
$(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT);
</del><ins>+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_ELEMENTS) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUC
TOR) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_ES6_MODULES) $(ENABLE_ES2017_ASYNCFUNCTION_SYNTAX) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(
ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENA
BLE_WEB_TIMING) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT);
</ins></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Source/WebCore/DerivedSources.make 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -441,7 +441,6 @@
</span><span class="cx"> $(WebCore)/html/MediaController.idl \
</span><span class="cx"> $(WebCore)/html/MediaError.idl \
</span><span class="cx"> $(WebCore)/html/MediaKeyError.idl \
</span><del>- $(WebCore)/html/MediaKeyEvent.idl \
</del><span class="cx"> $(WebCore)/html/RadioNodeList.idl \
</span><span class="cx"> $(WebCore)/html/TextMetrics.idl \
</span><span class="cx"> $(WebCore)/html/TimeRanges.idl \
</span><span class="lines">@@ -1076,10 +1075,6 @@
</span><span class="cx"> HTML_FLAGS := $(HTML_FLAGS) ENABLE_DATACUE_VALUE=0
</span><span class="cx"> endif
</span><span class="cx">
</span><del>-ifeq ($(findstring ENABLE_ENCRYPTED_MEDIA,$(FEATURE_DEFINES)), ENABLE_ENCRYPTED_MEDIA)
- HTML_FLAGS := $(HTML_FLAGS) ENABLE_ENCRYPTED_MEDIA=1
-endif
-
</del><span class="cx"> ifeq ($(findstring ENABLE_MEDIA_STREAM,$(FEATURE_DEFINES)), ENABLE_MEDIA_STREAM)
</span><span class="cx"> HTML_FLAGS := $(HTML_FLAGS) ENABLE_MEDIA_STREAM=1
</span><span class="cx"> endif
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -5696,8 +5696,6 @@
</span><span class="cx"> CDAB6D3117C9259500C60B34 /* UserAgentScripts.h in Headers */ = {isa = PBXBuildFile; fileRef = CDAB6D2F17C9259500C60B34 /* UserAgentScripts.h */; };
</span><span class="cx"> CDAB6D3217C9259500C60B34 /* UserAgentScriptsData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDAB6D3017C9259500C60B34 /* UserAgentScriptsData.cpp */; };
</span><span class="cx"> CDAE8C091746B95700532D78 /* PlatformMediaSessionManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDAE8C071746B95700532D78 /* PlatformMediaSessionManager.cpp */; };
</span><del>- CDB859F7160D48A400E5B07F /* MediaKeyEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDB859F4160D489900E5B07F /* MediaKeyEvent.cpp */; };
- CDB859FA160D494900E5B07F /* JSMediaKeyEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDB859F8160D493E00E5B07F /* JSMediaKeyEvent.cpp */; };
</del><span class="cx"> CDBEAEAC19D92B6C00BEBA88 /* MediaSelectionGroupAVFObjC.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDBEAEAA19D92B6C00BEBA88 /* MediaSelectionGroupAVFObjC.mm */; };
</span><span class="cx"> CDBEAEAD19D92B6C00BEBA88 /* MediaSelectionGroupAVFObjC.h in Headers */ = {isa = PBXBuildFile; fileRef = CDBEAEAB19D92B6C00BEBA88 /* MediaSelectionGroupAVFObjC.h */; };
</span><span class="cx"> CDC26B40160A8CC60026757B /* MockCDM.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDC26B3C160A62B00026757B /* MockCDM.cpp */; };
</span><span class="lines">@@ -13248,11 +13246,6 @@
</span><span class="cx"> CDAE8C081746B95700532D78 /* PlatformMediaSessionManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformMediaSessionManager.h; sourceTree = "<group>"; };
</span><span class="cx"> CDB859F2160D489900E5B07F /* MediaKeyError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaKeyError.h; sourceTree = "<group>"; };
</span><span class="cx"> CDB859F3160D489900E5B07F /* MediaKeyError.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MediaKeyError.idl; sourceTree = "<group>"; };
</span><del>- CDB859F4160D489900E5B07F /* MediaKeyEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaKeyEvent.cpp; sourceTree = "<group>"; };
- CDB859F5160D489900E5B07F /* MediaKeyEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaKeyEvent.h; sourceTree = "<group>"; };
- CDB859F6160D489900E5B07F /* MediaKeyEvent.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MediaKeyEvent.idl; sourceTree = "<group>"; };
- CDB859F8160D493E00E5B07F /* JSMediaKeyEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMediaKeyEvent.cpp; sourceTree = "<group>"; };
- CDB859F9160D493E00E5B07F /* JSMediaKeyEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMediaKeyEvent.h; sourceTree = "<group>"; };
</del><span class="cx"> CDBEAEAA19D92B6C00BEBA88 /* MediaSelectionGroupAVFObjC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MediaSelectionGroupAVFObjC.mm; sourceTree = "<group>"; };
</span><span class="cx"> CDBEAEAB19D92B6C00BEBA88 /* MediaSelectionGroupAVFObjC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaSelectionGroupAVFObjC.h; sourceTree = "<group>"; };
</span><span class="cx"> CDC1DD4117CC2C48008CB55D /* mediaControlsApple.css */ = {isa = PBXFileReference; lastKnownFileType = text.css; path = mediaControlsApple.css; sourceTree = "<group>"; };
</span><span class="lines">@@ -18120,9 +18113,6 @@
</span><span class="cx"> 07A6D1EA1491137700051D0C /* MediaFragmentURIParser.h */,
</span><span class="cx"> CDB859F2160D489900E5B07F /* MediaKeyError.h */,
</span><span class="cx"> CDB859F3160D489900E5B07F /* MediaKeyError.idl */,
</span><del>- CDB859F4160D489900E5B07F /* MediaKeyEvent.cpp */,
- CDB859F5160D489900E5B07F /* MediaKeyEvent.h */,
- CDB859F6160D489900E5B07F /* MediaKeyEvent.idl */,
</del><span class="cx"> F55B3D911251F12D003EF269 /* MonthInputType.cpp */,
</span><span class="cx"> F55B3D921251F12D003EF269 /* MonthInputType.h */,
</span><span class="cx"> F55B3D931251F12D003EF269 /* NumberInputType.cpp */,
</span><span class="lines">@@ -19066,8 +19056,6 @@
</span><span class="cx"> CD27F6E3145767580078207D /* JSMediaController.h */,
</span><span class="cx"> E44614100CD6826900FADA75 /* JSMediaError.cpp */,
</span><span class="cx"> E44614110CD6826900FADA75 /* JSMediaError.h */,
</span><del>- CDB859F8160D493E00E5B07F /* JSMediaKeyEvent.cpp */,
- CDB859F9160D493E00E5B07F /* JSMediaKeyEvent.h */,
</del><span class="cx"> C9026B631B1CF5AB001D99A7 /* JSMediaRemoteControls.cpp */,
</span><span class="cx"> C9026B641B1CF5AB001D99A7 /* JSMediaRemoteControls.h */,
</span><span class="cx"> C9DADBC91B1D3B25001F17D8 /* JSMediaSession.cpp */,
</span><span class="lines">@@ -28869,7 +28857,6 @@
</span><span class="cx"> FD23A12513F5FA5900F67001 /* JSMediaElementAudioSourceNode.cpp in Sources */,
</span><span class="cx"> E44614180CD6826900FADA75 /* JSMediaError.cpp in Sources */,
</span><span class="cx"> CDA98DA31601464100FEA3B1 /* JSMediaKeyError.cpp in Sources */,
</span><del>- CDB859FA160D494900E5B07F /* JSMediaKeyEvent.cpp in Sources */,
</del><span class="cx"> CDA98DDF16026A3700FEA3B1 /* JSMediaKeyMessageEvent.cpp in Sources */,
</span><span class="cx"> CDA98DE016026A3700FEA3B1 /* JSMediaKeyNeededEvent.cpp in Sources */,
</span><span class="cx"> CDA98E0416039E1A00FEA3B1 /* JSMediaKeys.cpp in Sources */,
</span><span class="lines">@@ -29373,7 +29360,6 @@
</span><span class="cx"> 5E4EAB051D07166E0006A184 /* MediaEndpointSessionDescription.cpp in Sources */,
</span><span class="cx"> 4E1959210A39DABA00220FE5 /* MediaFeatureNames.cpp in Sources */,
</span><span class="cx"> 07A6D1EB1491137700051D0C /* MediaFragmentURIParser.cpp in Sources */,
</span><del>- CDB859F7160D48A400E5B07F /* MediaKeyEvent.cpp in Sources */,
</del><span class="cx"> CDA98DD816025BEF00FEA3B1 /* MediaKeyMessageEvent.cpp in Sources */,
</span><span class="cx"> CD1B4A65160786AE00282DF9 /* MediaKeyNeededEvent.cpp in Sources */,
</span><span class="cx"> CDA98E0D1603FE4A00FEA3B1 /* MediaKeys.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDictionarycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDictionary.cpp (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDictionary.cpp 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Source/WebCore/bindings/js/JSDictionary.cpp 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> #include <wtf/MathExtras.h>
</span><span class="cx"> #include <wtf/text/AtomicString.h>
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA)
</del><ins>+#if ENABLE(ENCRYPTED_MEDIA_V2)
</ins><span class="cx"> #include "JSMediaKeyError.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -255,7 +255,7 @@
</span><span class="cx"> result = toUint8Array(value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA)
</del><ins>+#if ENABLE(ENCRYPTED_MEDIA_V2)
</ins><span class="cx"> void JSDictionary::convertValue(JSC::ExecState*, JSC::JSValue value, RefPtr<MediaKeyError>& result)
</span><span class="cx"> {
</span><span class="cx"> result = JSMediaKeyError::toWrapped(value);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDictionaryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDictionary.h (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDictionary.h 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Source/WebCore/bindings/js/JSDictionary.h 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx"> static void convertValue(JSC::ExecState*, JSC::JSValue, HashSet<AtomicString>& result);
</span><span class="cx"> static void convertValue(JSC::ExecState*, JSC::JSValue, ArrayValue& result);
</span><span class="cx"> static void convertValue(JSC::ExecState*, JSC::JSValue, RefPtr<JSC::Uint8Array>& result);
</span><del>-#if ENABLE(ENCRYPTED_MEDIA)
</del><ins>+#if ENABLE(ENCRYPTED_MEDIA_V2)
</ins><span class="cx"> static void convertValue(JSC::ExecState*, JSC::JSValue, RefPtr<MediaKeyError>& result);
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(FETCH_API)
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.idl (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.idl 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Source/WebCore/dom/Element.idl 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -173,10 +173,7 @@
</span><span class="cx">
</span><span class="cx"> // Unique to Element
</span><span class="cx"> [NotEnumerable] attribute EventHandler onbeforeload;
</span><del>- [NotEnumerable, Conditional=ENCRYPTED_MEDIA] attribute EventHandler onwebkitkeyadded;
- [NotEnumerable, Conditional=ENCRYPTED_MEDIA] attribute EventHandler onwebkitkeyerror;
- [NotEnumerable, Conditional=ENCRYPTED_MEDIA] attribute EventHandler onwebkitkeymessage;
- [NotEnumerable, Conditional=ENCRYPTED_MEDIA|ENCRYPTED_MEDIA_V2] attribute EventHandler onwebkitneedkey;
</del><ins>+ [NotEnumerable, Conditional=ENCRYPTED_MEDIA_V2] attribute EventHandler onwebkitneedkey;
</ins><span class="cx"> [NotEnumerable, Conditional=VIDEO_PRESENTATION_MODE] attribute EventHandler onwebkitpresentationmodechanged;
</span><span class="cx"> [NotEnumerable, Conditional=WIRELESS_PLAYBACK_TARGET] attribute EventHandler onwebkitcurrentplaybacktargetiswirelesschanged;
</span><span class="cx"> [NotEnumerable, Conditional=WIRELESS_PLAYBACK_TARGET] attribute EventHandler onwebkitplaybacktargetavailabilitychanged;
</span></span></pre></div>
<a id="trunkSourceWebCoredomEventNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/EventNames.in (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/EventNames.in 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Source/WebCore/dom/EventNames.in 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -56,7 +56,6 @@
</span><span class="cx"> DeviceOrientationEvent conditional=DEVICE_ORIENTATION
</span><span class="cx"> DeviceProximityEvent conditional=PROXIMITY_EVENTS
</span><span class="cx"> OrientationEvent interfaceName=Event, conditional=ORIENTATION_EVENTS
</span><del>-MediaKeyEvent conditional=ENCRYPTED_MEDIA
</del><span class="cx"> MediaKeyMessageEvent conditional=ENCRYPTED_MEDIA_V2
</span><span class="cx"> MediaKeyNeededEvent conditional=ENCRYPTED_MEDIA_V2
</span><span class="cx"> TrackEvent conditional=VIDEO_TRACK
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -65,7 +65,6 @@
</span><span class="cx"> #include "MediaDocument.h"
</span><span class="cx"> #include "MediaError.h"
</span><span class="cx"> #include "MediaFragmentURIParser.h"
</span><del>-#include "MediaKeyEvent.h"
</del><span class="cx"> #include "MediaList.h"
</span><span class="cx"> #include "MediaPlayer.h"
</span><span class="cx"> #include "MediaQueryEvaluator.h"
</span><span class="lines">@@ -264,23 +263,6 @@
</span><span class="cx"> map.add(&document, set);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA)
-static ExceptionCode exceptionCodeForMediaKeyException(MediaPlayer::MediaKeyException exception)
-{
- switch (exception) {
- case MediaPlayer::NoError:
- return 0;
- case MediaPlayer::InvalidPlayerState:
- return INVALID_STATE_ERR;
- case MediaPlayer::KeySystemNotSupported:
- return NOT_SUPPORTED_ERR;
- }
-
- ASSERT_NOT_REACHED();
- return INVALID_STATE_ERR;
-}
-#endif
-
</del><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> class TrackDisplayUpdateScope {
</span><span class="cx"> public:
</span><span class="lines">@@ -1120,18 +1102,12 @@
</span><span class="cx"> return m_networkState;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String HTMLMediaElement::canPlayType(const String& mimeType, const String& keySystem, const URL& url) const
</del><ins>+String HTMLMediaElement::canPlayType(const String& mimeType) const
</ins><span class="cx"> {
</span><span class="cx"> MediaEngineSupportParameters parameters;
</span><span class="cx"> ContentType contentType(mimeType);
</span><span class="cx"> parameters.type = contentType.type().convertToASCIILowercase();
</span><span class="cx"> parameters.codecs = contentType.parameter(ASCIILiteral("codecs"));
</span><del>- parameters.url = url;
-#if ENABLE(ENCRYPTED_MEDIA)
- parameters.keySystem = keySystem;
-#else
- UNUSED_PARAM(keySystem);
-#endif
</del><span class="cx"> MediaPlayer::SupportsType support = MediaPlayer::supportsType(parameters, this);
</span><span class="cx"> String canPlay;
</span><span class="cx">
</span><span class="lines">@@ -1149,7 +1125,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- LOG(Media, "HTMLMediaElement::canPlayType(%p) - [%s, %s, %s] -> %s", this, mimeType.utf8().data(), keySystem.utf8().data(), url.stringCenterEllipsizedToLength().utf8().data(), canPlay.utf8().data());
</del><ins>+ LOG(Media, "HTMLMediaElement::canPlayType(%p) - [%s] -> %s", this, mimeType.utf8().data(), canPlay.utf8().data());
</ins><span class="cx">
</span><span class="cx"> return canPlay;
</span><span class="cx"> }
</span><span class="lines">@@ -2447,65 +2423,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA)
-void HTMLMediaElement::mediaPlayerKeyAdded(MediaPlayer*, const String& keySystem, const String& sessionId)
-{
- Ref<Event> event = MediaKeyEvent::create(eventNames().webkitkeyaddedEvent, keySystem, sessionId, nullptr, nullptr, emptyString(), nullptr, 0);
- event->setTarget(this);
- m_asyncEventQueue.enqueueEvent(WTFMove(event));
-}
-
-void HTMLMediaElement::mediaPlayerKeyError(MediaPlayer*, const String& keySystem, const String& sessionId, MediaPlayerClient::MediaKeyErrorCode errorCode, unsigned short systemCode)
-{
- MediaKeyError::Code mediaKeyErrorCode = MediaKeyError::MEDIA_KEYERR_UNKNOWN;
- switch (errorCode) {
- case MediaPlayerClient::UnknownError:
- mediaKeyErrorCode = MediaKeyError::MEDIA_KEYERR_UNKNOWN;
- break;
- case MediaPlayerClient::ClientError:
- mediaKeyErrorCode = MediaKeyError::MEDIA_KEYERR_CLIENT;
- break;
- case MediaPlayerClient::ServiceError:
- mediaKeyErrorCode = MediaKeyError::MEDIA_KEYERR_SERVICE;
- break;
- case MediaPlayerClient::OutputError:
- mediaKeyErrorCode = MediaKeyError::MEDIA_KEYERR_OUTPUT;
- break;
- case MediaPlayerClient::HardwareChangeError:
- mediaKeyErrorCode = MediaKeyError::MEDIA_KEYERR_HARDWARECHANGE;
- break;
- case MediaPlayerClient::DomainError:
- mediaKeyErrorCode = MediaKeyError::MEDIA_KEYERR_DOMAIN;
- break;
- }
-
- Ref<Event> event = MediaKeyEvent::create(eventNames().webkitkeyerrorEvent, keySystem, sessionId, nullptr, nullptr, emptyString(), MediaKeyError::create(mediaKeyErrorCode), systemCode);
- event->setTarget(this);
- m_asyncEventQueue.enqueueEvent(WTFMove(event));
-}
-
-void HTMLMediaElement::mediaPlayerKeyMessage(MediaPlayer*, const String& keySystem, const String& sessionId, const unsigned char* message, unsigned messageLength, const URL& defaultURL)
-{
- Ref<Event> event = MediaKeyEvent::create(eventNames().webkitkeymessageEvent, keySystem, sessionId, nullptr, Uint8Array::create(message, messageLength), defaultURL, nullptr, 0);
- event->setTarget(this);
- m_asyncEventQueue.enqueueEvent(WTFMove(event));
-}
-
-bool HTMLMediaElement::mediaPlayerKeyNeeded(MediaPlayer*, const String& keySystem, const String& sessionId, const unsigned char* initData, unsigned initDataLength)
-{
- if (!hasEventListeners(eventNames().webkitneedkeyEvent)) {
- m_error = MediaError::create(MediaError::MEDIA_ERR_ENCRYPTED);
- scheduleEvent(eventNames().errorEvent);
- return false;
- }
-
- Ref<Event> event = MediaKeyEvent::create(eventNames().webkitneedkeyEvent, keySystem, sessionId, Uint8Array::create(initData, initDataLength), nullptr, emptyString(), nullptr, 0);
- event->setTarget(this);
- m_asyncEventQueue.enqueueEvent(WTFMove(event));
- return true;
-}
-#endif
-
</del><span class="cx"> #if ENABLE(ENCRYPTED_MEDIA_V2)
</span><span class="cx"> RefPtr<ArrayBuffer> HTMLMediaElement::mediaPlayerCachedKeyForKeyId(const String& keyId) const
</span><span class="cx"> {
</span><span class="lines">@@ -4277,6 +4194,7 @@
</span><span class="cx">
</span><span class="cx"> URL HTMLMediaElement::selectNextSourceChild(ContentType* contentType, String* keySystem, InvalidURLAction actionIfInvalid)
</span><span class="cx"> {
</span><ins>+ UNUSED_PARAM(keySystem);
</ins><span class="cx"> #if !LOG_DISABLED
</span><span class="cx"> // Don't log if this was just called to find out if there are any valid <source> elements.
</span><span class="cx"> bool shouldLog = actionIfInvalid != DoNothing;
</span><span class="lines">@@ -4295,7 +4213,6 @@
</span><span class="cx"> URL mediaURL;
</span><span class="cx"> HTMLSourceElement* source = nullptr;
</span><span class="cx"> String type;
</span><del>- String system;
</del><span class="cx"> bool lookingForStartNode = m_nextChildNodeToConsider;
</span><span class="cx"> bool canUseSourceElement = false;
</span><span class="cx"> bool okToLoadSourceURL;
</span><span class="lines">@@ -4339,13 +4256,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> type = source->type();
</span><del>- // FIXME(82965): Add support for keySystem in <source> and set system from source.
</del><span class="cx"> if (type.isEmpty() && mediaURL.protocolIsData())
</span><span class="cx"> type = mimeTypeFromDataURL(mediaURL);
</span><del>- if (!type.isEmpty() || !system.isEmpty()) {
</del><ins>+ if (!type.isEmpty()) {
</ins><span class="cx"> #if !LOG_DISABLED
</span><span class="cx"> if (shouldLog)
</span><del>- LOG(Media, "HTMLMediaElement::selectNextSourceChild(%p) - 'type' is '%s' - key system is '%s'", this, type.utf8().data(), system.utf8().data());
</del><ins>+ LOG(Media, "HTMLMediaElement::selectNextSourceChild(%p) - 'type' is '%s'", this, type.utf8().data());
</ins><span class="cx"> #endif
</span><span class="cx"> MediaEngineSupportParameters parameters;
</span><span class="cx"> ContentType contentType(type);
</span><span class="lines">@@ -4352,9 +4268,6 @@
</span><span class="cx"> parameters.type = contentType.type().convertToASCIILowercase();
</span><span class="cx"> parameters.codecs = contentType.parameter(ASCIILiteral("codecs"));
</span><span class="cx"> parameters.url = mediaURL;
</span><del>-#if ENABLE(ENCRYPTED_MEDIA)
- parameters.keySystem = system;
-#endif
</del><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><span class="cx"> parameters.isMediaSource = mediaURL.protocolIs(mediaSourceBlobProtocol);
</span><span class="cx"> #endif
</span><span class="lines">@@ -4389,8 +4302,6 @@
</span><span class="cx"> if (canUseSourceElement) {
</span><span class="cx"> if (contentType)
</span><span class="cx"> *contentType = ContentType(type);
</span><del>- if (keySystem)
- *keySystem = system;
</del><span class="cx"> m_currentSourceNode = source;
</span><span class="cx"> m_nextChildNodeToConsider = source->nextSibling();
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx">
</span><span class="cx"> Ref<TimeRanges> buffered() const override;
</span><span class="cx"> WEBCORE_EXPORT void load();
</span><del>- WEBCORE_EXPORT String canPlayType(const String& mimeType, const String& keySystem = String(), const URL& = URL()) const;
</del><ins>+ WEBCORE_EXPORT String canPlayType(const String& mimeType) const;
</ins><span class="cx">
</span><span class="cx"> // ready state
</span><span class="cx"> using HTMLMediaElementEnums::ReadyState;
</span><span class="lines">@@ -248,12 +248,6 @@
</span><span class="cx"> size_t maximumSourceBufferSize(const SourceBuffer&) const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA)
- void webkitGenerateKeyRequest(const String& keySystem, const RefPtr<Uint8Array>& initData, ExceptionCode&);
- void webkitAddKey(const String& keySystem, Uint8Array& key, const RefPtr<Uint8Array>& initData, const String& sessionId, ExceptionCode&);
- void webkitCancelKeyRequest(const String& keySystem, const String& sessionId, ExceptionCode&);
-#endif
-
</del><span class="cx"> #if ENABLE(ENCRYPTED_MEDIA_V2)
</span><span class="cx"> MediaKeys* keys() const { return m_mediaKeys.get(); }
</span><span class="cx"> void setMediaKeys(MediaKeys*);
</span><span class="lines">@@ -574,13 +568,6 @@
</span><span class="cx"> void mediaPlayerFirstVideoFrameAvailable(MediaPlayer*) override;
</span><span class="cx"> void mediaPlayerCharacteristicChanged(MediaPlayer*) override;
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA)
- void mediaPlayerKeyAdded(MediaPlayer*, const String& keySystem, const String& sessionId) override;
- void mediaPlayerKeyError(MediaPlayer*, const String& keySystem, const String& sessionId, MediaPlayerClient::MediaKeyErrorCode, unsigned short systemCode) override;
- void mediaPlayerKeyMessage(MediaPlayer*, const String& keySystem, const String& sessionId, const unsigned char* message, unsigned messageLength, const URL& defaultURL) override;
- bool mediaPlayerKeyNeeded(MediaPlayer*, const String& keySystem, const String& sessionId, const unsigned char* initData, unsigned initDataLength) override;
-#endif
-
</del><span class="cx"> #if ENABLE(ENCRYPTED_MEDIA_V2)
</span><span class="cx"> RefPtr<ArrayBuffer> mediaPlayerCachedKeyForKeyId(const String& keyId) const override;
</span><span class="cx"> bool mediaPlayerKeyNeeded(MediaPlayer*, Uint8Array*) override;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.idl (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.idl 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Source/WebCore/html/HTMLMediaElement.idl 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -48,11 +48,7 @@
</span><span class="cx"> readonly attribute TimeRanges buffered;
</span><span class="cx"> void load();
</span><span class="cx">
</span><del>-#if (defined(ENABLE_ENCRYPTED_MEDIA) && ENABLE_ENCRYPTED_MEDIA) || (defined(ENABLE_ENCRYPTED_MEDIA_V2) && ENABLE_ENCRYPTED_MEDIA_V2)
- DOMString canPlayType(DOMString type, optional DOMString? keySystem = null);
-#else
</del><span class="cx"> DOMString canPlayType(DOMString type);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // ready state
</span><span class="cx"> const unsigned short HAVE_NOTHING = 0;
</span><span class="lines">@@ -95,10 +91,6 @@
</span><span class="cx"> [Conditional=MEDIA_STATISTICS] readonly attribute unsigned long webkitAudioDecodedByteCount;
</span><span class="cx"> [Conditional=MEDIA_STATISTICS] readonly attribute unsigned long webkitVideoDecodedByteCount;
</span><span class="cx">
</span><del>- [Conditional=ENCRYPTED_MEDIA, RaisesException] void webkitGenerateKeyRequest(DOMString? keySystem, optional Uint8Array? initData = null);
- [Conditional=ENCRYPTED_MEDIA, RaisesException] void webkitAddKey(DOMString? keySystem, Uint8Array key, optional Uint8Array? initData = null, optional DOMString sessionId);
- [Conditional=ENCRYPTED_MEDIA, RaisesException] void webkitCancelKeyRequest(DOMString? keySystem, optional DOMString sessionId);
-
</del><span class="cx"> [Conditional=ENCRYPTED_MEDIA_V2, ImplementedAs=keys] readonly attribute MediaKeys webkitKeys;
</span><span class="cx"> [Conditional=ENCRYPTED_MEDIA_V2, ImplementedAs=setMediaKeys] void webkitSetMediaKeys(MediaKeys? mediaKeys);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaErrorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaError.h (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaError.h 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Source/WebCore/html/MediaError.h 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> MEDIA_ERR_NETWORK,
</span><span class="cx"> MEDIA_ERR_DECODE,
</span><span class="cx"> MEDIA_ERR_SRC_NOT_SUPPORTED
</span><del>-#if ENABLE(ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(ENCRYPTED_MEDIA_V2)
</ins><span class="cx"> , MEDIA_ERR_ENCRYPTED
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaErroridl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaError.idl (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaError.idl 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Source/WebCore/html/MediaError.idl 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> const unsigned short MEDIA_ERR_NETWORK = 2;
</span><span class="cx"> const unsigned short MEDIA_ERR_DECODE = 3;
</span><span class="cx"> const unsigned short MEDIA_ERR_SRC_NOT_SUPPORTED = 4;
</span><del>-#if (defined(ENABLE_ENCRYPTED_MEDIA) && ENABLE_ENCRYPTED_MEDIA) || (defined(ENABLE_ENCRYPTED_MEDIA_V2) && ENABLE_ENCRYPTED_MEDIA_V2)
</del><ins>+#if (defined(ENABLE_ENCRYPTED_MEDIA_V2) && ENABLE_ENCRYPTED_MEDIA_V2)
</ins><span class="cx"> const unsigned short MEDIA_ERR_ENCRYPTED = 5;
</span><span class="cx"> #endif
</span><span class="cx"> readonly attribute unsigned short code;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaKeyErrorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaKeyError.h (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaKeyError.h 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Source/WebCore/html/MediaKeyError.h 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef MediaKeyError_h
</span><span class="cx"> #define MediaKeyError_h
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(ENCRYPTED_MEDIA_V2)
</ins><span class="cx">
</span><span class="cx"> #include <runtime/Uint8Array.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaKeyErroridl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaKeyError.idl (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaKeyError.idl 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Source/WebCore/html/MediaKeyError.idl 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> [
</span><del>- Conditional=ENCRYPTED_MEDIA|ENCRYPTED_MEDIA_V2,
</del><ins>+ Conditional=ENCRYPTED_MEDIA_V2,
</ins><span class="cx"> ImplementationLacksVTable,
</span><span class="cx"> InterfaceName=WebKitMediaKeyError
</span><span class="cx"> ] interface MediaKeyError {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaKeyEventcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/html/MediaKeyEvent.cpp (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaKeyEvent.cpp 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Source/WebCore/html/MediaKeyEvent.cpp 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -1,71 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Google 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. ``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
- * 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"
-
-#if ENABLE(ENCRYPTED_MEDIA)
-
-#include "MediaKeyEvent.h"
-
-#include "EventNames.h"
-
-namespace WebCore {
-
-MediaKeyEvent::MediaKeyEvent(const AtomicString& type, const String& keySystem, const String& sessionId, RefPtr<Uint8Array>&& initData, RefPtr<Uint8Array>&& message, const String& defaultURL, RefPtr<MediaKeyError>&& errorCode, uint32_t systemCode)
- : Event(type, false, false)
- , m_keySystem(keySystem)
- , m_sessionId(sessionId)
- , m_initData(initData)
- , m_message(message)
- , m_defaultURL(defaultURL)
- , m_errorCode(errorCode)
- , m_systemCode(systemCode)
-{
-}
-
-MediaKeyEvent::MediaKeyEvent(const AtomicString& type, const MediaKeyEventInit& initializer)
- : Event(type, initializer)
- , m_keySystem(initializer.keySystem)
- , m_sessionId(initializer.sessionId)
- , m_initData(initializer.initData)
- , m_message(initializer.message)
- , m_defaultURL(initializer.defaultURL)
- , m_errorCode(initializer.errorCode)
- , m_systemCode(initializer.systemCode)
-{
-}
-
-MediaKeyEvent::~MediaKeyEvent()
-{
-}
-
-EventInterface MediaKeyEvent::eventInterface() const
-{
- return MediaKeyEventInterfaceType;
-}
-
-} // namespace WebCore
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaKeyEventh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/html/MediaKeyEvent.h (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaKeyEvent.h 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Source/WebCore/html/MediaKeyEvent.h 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -1,87 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Google 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. ``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
- * 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.
- */
-
-#ifndef MediaKeyEvent_h
-#define MediaKeyEvent_h
-
-#if ENABLE(ENCRYPTED_MEDIA)
-
-#include "Event.h"
-#include "MediaKeyError.h"
-
-namespace WebCore {
-
-struct MediaKeyEventInit : public EventInit {
- String keySystem;
- String sessionId;
- RefPtr<Uint8Array> initData;
- RefPtr<Uint8Array> message;
- String defaultURL;
- RefPtr<MediaKeyError> errorCode;
- uint32_t systemCode { 0 };
-};
-
-class MediaKeyEvent final : public Event {
-public:
- virtual ~MediaKeyEvent();
-
- static Ref<MediaKeyEvent> create(const AtomicString& type, const String& keySystem, const String& sessionId, RefPtr<Uint8Array>&& initData, RefPtr<Uint8Array>&& message, const String& defaultURL, RefPtr<MediaKeyError>&& errorCode, uint32_t systemCode)
- {
- return adoptRef(*new MediaKeyEvent(type, keySystem, sessionId, WTFMove(initData), WTFMove(message), defaultURL, WTFMove(errorCode), systemCode));
- }
-
- static Ref<MediaKeyEvent> createForBindings(const AtomicString& type, const MediaKeyEventInit& initializer)
- {
- return adoptRef(*new MediaKeyEvent(type, initializer));
- }
-
- EventInterface eventInterface() const override;
-
- String keySystem() const { return m_keySystem; }
- String sessionId() const { return m_sessionId; }
- Uint8Array* initData() const { return m_initData.get(); }
- Uint8Array* message() const { return m_message.get(); }
- String defaultURL() const { return m_defaultURL; }
- MediaKeyError* errorCode() const { return m_errorCode.get(); }
- unsigned short systemCode() const { return m_systemCode; }
-
-private:
- MediaKeyEvent(const AtomicString& type, const String& keySystem, const String& sessionId, RefPtr<Uint8Array>&& initData, RefPtr<Uint8Array>&& message, const String& defaultURL, RefPtr<MediaKeyError>&& errorCode, uint32_t systemCode);
-
- MediaKeyEvent(const AtomicString& type, const MediaKeyEventInit& initializer);
-
- String m_keySystem;
- String m_sessionId;
- RefPtr<Uint8Array> m_initData;
- RefPtr<Uint8Array> m_message;
- String m_defaultURL;
- RefPtr<MediaKeyError> m_errorCode;
- unsigned short m_systemCode;
-};
-
-} // namespace WebCore
-
-#endif
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaKeyEventidl"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/html/MediaKeyEvent.idl (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaKeyEvent.idl 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Source/WebCore/html/MediaKeyEvent.idl 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -1,38 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Google 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. ``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
- * 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.
- */
-
-[
- Conditional=ENCRYPTED_MEDIA,
- ConstructorTemplate=Event
-] interface MediaKeyEvent : Event {
- [InitializedByEventConstructor] readonly attribute DOMString keySystem;
- [InitializedByEventConstructor] readonly attribute DOMString sessionId;
- [InitializedByEventConstructor] readonly attribute Uint8Array initData;
- [InitializedByEventConstructor] readonly attribute Uint8Array message;
- [InitializedByEventConstructor] readonly attribute DOMString defaultURL;
- [InitializedByEventConstructor] readonly attribute MediaKeyError errorCode;
- [InitializedByEventConstructor] readonly attribute unsigned short systemCode;
-};
-
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -156,12 +156,6 @@
</span><span class="cx"> void setPoster(const String&) override { }
</span><span class="cx">
</span><span class="cx"> bool hasSingleSecurityOrigin() const override { return true; }
</span><del>-
-#if ENABLE(ENCRYPTED_MEDIA)
- MediaPlayer::MediaKeyException generateKeyRequest(const String&, const unsigned char*, unsigned) override { return MediaPlayer::InvalidPlayerState; }
- MediaPlayer::MediaKeyException addKey(const String&, const unsigned char*, unsigned, const unsigned char*, unsigned, const String&) override { return MediaPlayer::InvalidPlayerState; }
- MediaPlayer::MediaKeyException cancelKeyRequest(const String&, const String&) override { return MediaPlayer::InvalidPlayerState; }
-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // engine support
</span><span class="lines">@@ -424,9 +418,6 @@
</span><span class="cx"> parameters.type = m_contentMIMEType;
</span><span class="cx"> parameters.codecs = m_contentTypeCodecs;
</span><span class="cx"> parameters.url = m_url;
</span><del>-#if ENABLE(ENCRYPTED_MEDIA)
- parameters.keySystem = m_keySystem;
-#endif
</del><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><span class="cx"> parameters.isMediaSource = !!m_mediaSource;
</span><span class="cx"> #endif
</span><span class="lines">@@ -546,23 +537,6 @@
</span><span class="cx"> m_private->setShouldBufferData(shouldBuffer);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA)
-MediaPlayer::MediaKeyException MediaPlayer::generateKeyRequest(const String& keySystem, const unsigned char* initData, unsigned initDataLength)
-{
- return m_private->generateKeyRequest(keySystem.convertToASCIILowercase(), initData, initDataLength);
-}
-
-MediaPlayer::MediaKeyException MediaPlayer::addKey(const String& keySystem, const unsigned char* key, unsigned keyLength, const unsigned char* initData, unsigned initDataLength, const String& sessionId)
-{
- return m_private->addKey(keySystem.convertToASCIILowercase(), key, keyLength, initData, initDataLength, sessionId);
-}
-
-MediaPlayer::MediaKeyException MediaPlayer::cancelKeyRequest(const String& keySystem, const String& sessionId)
-{
- return m_private->cancelKeyRequest(keySystem.convertToASCIILowercase(), sessionId);
-}
-#endif
-
</del><span class="cx"> #if ENABLE(ENCRYPTED_MEDIA_V2)
</span><span class="cx"> std::unique_ptr<CDMSession> MediaPlayer::createSession(const String& keySystem, CDMSessionClient* client)
</span><span class="cx"> {
</span><span class="lines">@@ -1193,28 +1167,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // WEB_AUDIO
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA)
-void MediaPlayer::keyAdded(const String& keySystem, const String& sessionId)
-{
- m_client.mediaPlayerKeyAdded(this, keySystem, sessionId);
-}
-
-void MediaPlayer::keyError(const String& keySystem, const String& sessionId, MediaPlayerClient::MediaKeyErrorCode errorCode, unsigned short systemCode)
-{
- m_client.mediaPlayerKeyError(this, keySystem, sessionId, errorCode, systemCode);
-}
-
-void MediaPlayer::keyMessage(const String& keySystem, const String& sessionId, const unsigned char* message, unsigned messageLength, const URL& defaultURL)
-{
- m_client.mediaPlayerKeyMessage(this, keySystem, sessionId, message, messageLength, defaultURL);
-}
-
-bool MediaPlayer::keyNeeded(const String& keySystem, const String& sessionId, const unsigned char* initData, unsigned initDataLength)
-{
- return m_client.mediaPlayerKeyNeeded(this, keySystem, sessionId, initData, initDataLength);
-}
-#endif
-
</del><span class="cx"> #if ENABLE(ENCRYPTED_MEDIA_V2)
</span><span class="cx"> RefPtr<ArrayBuffer> MediaPlayer::cachedKeyForKeyId(const String& keyId) const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -110,7 +110,6 @@
</span><span class="cx"> String type;
</span><span class="cx"> String codecs;
</span><span class="cx"> URL url;
</span><del>- String keySystem;
</del><span class="cx"> bool isMediaSource { false };
</span><span class="cx"> bool isMediaStream { false };
</span><span class="cx"> };
</span><span class="lines">@@ -202,14 +201,6 @@
</span><span class="cx"> virtual GraphicsDeviceAdapter* mediaPlayerGraphicsDeviceAdapter(const MediaPlayer*) const { return 0; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA)
- enum MediaKeyErrorCode { UnknownError = 1, ClientError, ServiceError, OutputError, HardwareChangeError, DomainError };
- virtual void mediaPlayerKeyAdded(MediaPlayer*, const String& /* keySystem */, const String& /* sessionId */) { }
- virtual void mediaPlayerKeyError(MediaPlayer*, const String& /* keySystem */, const String& /* sessionId */, MediaKeyErrorCode, unsigned short /* systemCode */) { }
- virtual void mediaPlayerKeyMessage(MediaPlayer*, const String& /* keySystem */, const String& /* sessionId */, const unsigned char* /* message */, unsigned /* messageLength */, const URL& /* defaultURL */) { }
- virtual bool mediaPlayerKeyNeeded(MediaPlayer*, const String& /* keySystem */, const String& /* sessionId */, const unsigned char* /* initData */, unsigned /* initDataLength */) { return false; }
-#endif
-
</del><span class="cx"> #if ENABLE(ENCRYPTED_MEDIA_V2)
</span><span class="cx"> virtual RefPtr<ArrayBuffer> mediaPlayerCachedKeyForKeyId(const String&) const { return nullptr; }
</span><span class="cx"> virtual bool mediaPlayerKeyNeeded(MediaPlayer*, Uint8Array*) { return false; }
</span><span class="lines">@@ -350,19 +341,11 @@
</span><span class="cx"> void pause();
</span><span class="cx"> void setShouldBufferData(bool);
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(ENCRYPTED_MEDIA_V2)
</ins><span class="cx"> // Represents synchronous exceptions that can be thrown from the Encrypted Media methods.
</span><span class="cx"> // This is different from the asynchronous MediaKeyError.
</span><span class="cx"> enum MediaKeyException { NoError, InvalidPlayerState, KeySystemNotSupported };
</span><del>-#endif
</del><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA)
- MediaKeyException generateKeyRequest(const String& keySystem, const unsigned char* initData, unsigned initDataLength);
- MediaKeyException addKey(const String& keySystem, const unsigned char* key, unsigned keyLength, const unsigned char* initData, unsigned initDataLength, const String& sessionId);
- MediaKeyException cancelKeyRequest(const String& keySystem, const String& sessionId);
-#endif
-
-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><span class="cx"> std::unique_ptr<CDMSession> createSession(const String& keySystem, CDMSessionClient*);
</span><span class="cx"> void setCDMSession(CDMSession*);
</span><span class="cx"> void keyAdded();
</span><span class="lines">@@ -526,13 +509,6 @@
</span><span class="cx"> AudioSourceProvider* audioSourceProvider();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA)
- void keyAdded(const String& keySystem, const String& sessionId);
- void keyError(const String& keySystem, const String& sessionId, MediaPlayerClient::MediaKeyErrorCode, unsigned short systemCode);
- void keyMessage(const String& keySystem, const String& sessionId, const unsigned char* message, unsigned messageLength, const URL& defaultURL);
- bool keyNeeded(const String& keySystem, const String& sessionId, const unsigned char* initData, unsigned initDataLength);
-#endif
-
</del><span class="cx"> #if ENABLE(ENCRYPTED_MEDIA_V2)
</span><span class="cx"> RefPtr<ArrayBuffer> cachedKeyForKeyId(const String& keyId) const;
</span><span class="cx"> bool keyNeeded(Uint8Array* initData);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -226,12 +226,6 @@
</span><span class="cx"> virtual AudioSourceProvider* audioSourceProvider() { return 0; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA)
- virtual MediaPlayer::MediaKeyException addKey(const String&, const unsigned char*, unsigned, const unsigned char*, unsigned, const String&) { return MediaPlayer::KeySystemNotSupported; }
- virtual MediaPlayer::MediaKeyException generateKeyRequest(const String&, const unsigned char*, unsigned) { return MediaPlayer::KeySystemNotSupported; }
- virtual MediaPlayer::MediaKeyException cancelKeyRequest(const String&, const String&) { return MediaPlayer::KeySystemNotSupported; }
-#endif
-
</del><span class="cx"> #if ENABLE(ENCRYPTED_MEDIA_V2)
</span><span class="cx"> virtual std::unique_ptr<CDMSession> createSession(const String&, CDMSessionClient*) { return nullptr; }
</span><span class="cx"> virtual void setCDMSession(CDMSession*) { }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -1014,7 +1014,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(ENCRYPTED_MEDIA_V2)
</ins><span class="cx"> bool MediaPlayerPrivateAVFoundation::extractKeyURIKeyIDAndCertificateFromInitData(Uint8Array* initData, String& keyURI, String& keyID, RefPtr<Uint8Array>& certificate)
</span><span class="cx"> {
</span><span class="cx"> // initData should have the following layout:
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> void dispatchNotification();
</span><span class="cx"> void clearMainThreadPendingFlag();
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(ENCRYPTED_MEDIA_V2)
</ins><span class="cx"> static bool extractKeyURIKeyIDAndCertificateFromInitData(Uint8Array* initData, String& keyURI, String& keyID, RefPtr<Uint8Array>& certificate);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionAVContentKeySessionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -283,7 +283,7 @@
</span><span class="cx"> NSError* error = nil;
</span><span class="cx"> NSData* requestData = [m_keyRequest contentKeyRequestDataForApp:certificateData.get() contentIdentifier:nil options:options.get() error:&error];
</span><span class="cx"> if (error) {
</span><del>- errorCode = MediaPlayerClient::DomainError;
</del><ins>+ errorCode = CDM::DomainError;
</ins><span class="cx"> systemCode = mediaKeyErrorSystemCode(error);
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -275,12 +275,6 @@
</span><span class="cx"> bool copyVideoTextureToPlatformTexture(GraphicsContext3D*, Platform3DObject, GC3Denum target, GC3Dint level, GC3Denum internalFormat, GC3Denum format, GC3Denum type, bool premultiplyAlpha, bool flipY) override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA)
- MediaPlayer::MediaKeyException addKey(const String&, const unsigned char*, unsigned, const unsigned char*, unsigned, const String&) override;
- MediaPlayer::MediaKeyException generateKeyRequest(const String&, const unsigned char*, unsigned) override;
- MediaPlayer::MediaKeyException cancelKeyRequest(const String&, const String&) override;
-#endif
-
</del><span class="cx"> #if ENABLE(ENCRYPTED_MEDIA_V2)
</span><span class="cx"> std::unique_ptr<CDMSession> createSession(const String& keySystem, CDMSessionClient*) override;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -1655,7 +1655,7 @@
</span><span class="cx"> supportedTypes = AVFoundationMIMETypeCache::singleton().types();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(ENCRYPTED_MEDIA_V2)
</ins><span class="cx"> static bool keySystemIsSupported(const String& keySystem)
</span><span class="cx"> {
</span><span class="cx"> if (equalIgnoringASCIICase(keySystem, "com.apple.fps") || equalIgnoringASCIICase(keySystem, "com.apple.fps.1_0") || equalIgnoringASCIICase(keySystem, "org.w3c.clearkey"))
</span><span class="lines">@@ -1666,28 +1666,6 @@
</span><span class="cx">
</span><span class="cx"> MediaPlayer::SupportsType MediaPlayerPrivateAVFoundationObjC::supportsType(const MediaEngineSupportParameters& parameters)
</span><span class="cx"> {
</span><del>-#if ENABLE(ENCRYPTED_MEDIA)
- // From: <http://dvcs.w3.org/hg/html-media/raw-file/eme-v0.1b/encrypted-media/encrypted-media.html#dom-canplaytype>
- // In addition to the steps in the current specification, this method must run the following steps:
-
- // 1. Check whether the Key System is supported with the specified container and codec type(s) by following the steps for the first matching condition from the following list:
- // If keySystem is null, continue to the next step.
- if (!parameters.keySystem.isNull() && !parameters.keySystem.isEmpty()) {
- // "Clear Key" is only supported with HLS:
- if (equalIgnoringASCIICase(parameters.keySystem, "org.w3c.clearkey") && !parameters.type.isEmpty() && !equalIgnoringASCIICase(parameters.type, "application/x-mpegurl"))
- return MediaPlayer::IsNotSupported;
-
- // If keySystem contains an unrecognized or unsupported Key System, return the empty string
- if (!keySystemIsSupported(parameters.keySystem))
- return MediaPlayer::IsNotSupported;
-
- // If the Key System specified by keySystem does not support decrypting the container and/or codec specified in the rest of the type string.
- // (AVFoundation does not provide an API which would allow us to determine this, so this is a no-op)
- }
-
- // 2. Return "maybe" or "probably" as appropriate per the existing specification of canPlayType().
-#endif
-
</del><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><span class="cx"> if (parameters.isMediaSource)
</span><span class="cx"> return MediaPlayer::IsNotSupported;
</span><span class="lines">@@ -1713,7 +1691,7 @@
</span><span class="cx">
</span><span class="cx"> bool MediaPlayerPrivateAVFoundationObjC::supportsKeySystem(const String& keySystem, const String& mimeType)
</span><span class="cx"> {
</span><del>-#if ENABLE(ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(ENCRYPTED_MEDIA_V2)
</ins><span class="cx"> if (!keySystem.isEmpty()) {
</span><span class="cx"> // "Clear Key" is only supported with HLS:
</span><span class="cx"> if (equalIgnoringASCIICase(keySystem, "org.w3c.clearkey") && !mimeType.isEmpty() && !equalIgnoringASCIICase(mimeType, "application/x-mpegurl"))
</span><span class="lines">@@ -1771,7 +1749,7 @@
</span><span class="cx"> String scheme = [[[avRequest request] URL] scheme];
</span><span class="cx"> String keyURI = [[[avRequest request] URL] absoluteString];
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(ENCRYPTED_MEDIA_V2)
</ins><span class="cx"> if (scheme == "skd") {
</span><span class="cx"> // Create an initData with the following layout:
</span><span class="cx"> // [4 bytes: keyURI size], [keyURI size bytes: keyURI]
</span><span class="lines">@@ -1783,17 +1761,12 @@
</span><span class="cx"> RefPtr<Uint16Array> keyURIArray = Uint16Array::create(initDataBuffer, 4, keyURI.length());
</span><span class="cx"> keyURIArray->setRange(StringView(keyURI).upconvertedCharacters(), keyURI.length() / sizeof(unsigned char), 0);
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA)
- if (!player()->keyNeeded("com.apple.lskd", emptyString(), static_cast<const unsigned char*>(initDataBuffer->data()), initDataBuffer->byteLength()))
-#elif ENABLE(ENCRYPTED_MEDIA_V2)
</del><span class="cx"> RefPtr<Uint8Array> initData = Uint8Array::create(initDataBuffer, 0, initDataBuffer->byteLength());
</span><span class="cx"> if (!player()->keyNeeded(initData.get()))
</span><del>-#endif
</del><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> m_keyURIToRequestMap.set(keyURI, avRequest);
</span><span class="cx"> return true;
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><span class="cx"> } else if (scheme == "clearkey") {
</span><span class="cx"> String keyID = [[[avRequest request] URL] resourceSpecifier];
</span><span class="cx"> StringView keyIDView(keyID);
</span><span class="lines">@@ -1813,7 +1786,6 @@
</span><span class="cx">
</span><span class="cx"> m_keyURIToRequestMap.set(keyID, avRequest);
</span><span class="cx"> return true;
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -2489,83 +2461,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA)
-MediaPlayer::MediaKeyException MediaPlayerPrivateAVFoundationObjC::generateKeyRequest(const String& keySystem, const unsigned char* initDataPtr, unsigned initDataLength)
-{
- if (!keySystemIsSupported(keySystem))
- return MediaPlayer::KeySystemNotSupported;
-
- RefPtr<Uint8Array> initData = Uint8Array::create(initDataPtr, initDataLength);
- String keyURI;
- String keyID;
- RefPtr<Uint8Array> certificate;
- if (!extractKeyURIKeyIDAndCertificateFromInitData(initData.get(), keyURI, keyID, certificate))
- return MediaPlayer::InvalidPlayerState;
-
- if (!m_keyURIToRequestMap.contains(keyURI))
- return MediaPlayer::InvalidPlayerState;
-
- String sessionID = createCanonicalUUIDString();
-
- RetainPtr<AVAssetResourceLoadingRequest> avRequest = m_keyURIToRequestMap.get(keyURI);
-
- RetainPtr<NSData> certificateData = adoptNS([[NSData alloc] initWithBytes:certificate->baseAddress() length:certificate->byteLength()]);
- NSString* assetStr = keyID;
- RetainPtr<NSData> assetID = [NSData dataWithBytes: [assetStr cStringUsingEncoding:NSUTF8StringEncoding] length:[assetStr lengthOfBytesUsingEncoding:NSUTF8StringEncoding]];
- NSError* error = 0;
- RetainPtr<NSData> keyRequest = [avRequest.get() streamingContentKeyRequestDataForApp:certificateData.get() contentIdentifier:assetID.get() options:nil error:&error];
-
- if (!keyRequest) {
- NSError* underlyingError = [[error userInfo] objectForKey:NSUnderlyingErrorKey];
- player()->keyError(keySystem, sessionID, MediaPlayerClient::DomainError, [underlyingError code]);
- return MediaPlayer::NoError;
- }
-
- RefPtr<ArrayBuffer> keyRequestBuffer = ArrayBuffer::create([keyRequest.get() bytes], [keyRequest.get() length]);
- RefPtr<Uint8Array> keyRequestArray = Uint8Array::create(keyRequestBuffer, 0, keyRequestBuffer->byteLength());
- player()->keyMessage(keySystem, sessionID, keyRequestArray->data(), keyRequestArray->byteLength(), URL());
-
- // Move ownership of the AVAssetResourceLoadingRequestfrom the keyIDToRequestMap to the sessionIDToRequestMap:
- m_sessionIDToRequestMap.set(sessionID, avRequest);
- m_keyURIToRequestMap.remove(keyURI);
-
- return MediaPlayer::NoError;
-}
-
-MediaPlayer::MediaKeyException MediaPlayerPrivateAVFoundationObjC::addKey(const String& keySystem, const unsigned char* keyPtr, unsigned keyLength, const unsigned char* initDataPtr, unsigned initDataLength, const String& sessionID)
-{
- if (!keySystemIsSupported(keySystem))
- return MediaPlayer::KeySystemNotSupported;
-
- if (!m_sessionIDToRequestMap.contains(sessionID))
- return MediaPlayer::InvalidPlayerState;
-
- RetainPtr<AVAssetResourceLoadingRequest> avRequest = m_sessionIDToRequestMap.get(sessionID);
- RetainPtr<NSData> keyData = adoptNS([[NSData alloc] initWithBytes:keyPtr length:keyLength]);
- [[avRequest.get() dataRequest] respondWithData:keyData.get()];
- [avRequest.get() finishLoading];
- m_sessionIDToRequestMap.remove(sessionID);
-
- player()->keyAdded(keySystem, sessionID);
-
- UNUSED_PARAM(initDataPtr);
- UNUSED_PARAM(initDataLength);
- return MediaPlayer::NoError;
-}
-
-MediaPlayer::MediaKeyException MediaPlayerPrivateAVFoundationObjC::cancelKeyRequest(const String& keySystem, const String& sessionID)
-{
- if (!keySystemIsSupported(keySystem))
- return MediaPlayer::KeySystemNotSupported;
-
- if (!m_sessionIDToRequestMap.contains(sessionID))
- return MediaPlayer::InvalidPlayerState;
-
- m_sessionIDToRequestMap.remove(sessionID);
- return MediaPlayer::NoError;
-}
-#endif
-
</del><span class="cx"> #if ENABLE(ENCRYPTED_MEDIA_V2)
</span><span class="cx"> RetainPtr<AVAssetResourceLoadingRequest> MediaPlayerPrivateAVFoundationObjC::takeRequestForKeyURI(const String& keyURI)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -1307,12 +1307,6 @@
</span><span class="cx">
</span><span class="cx"> MediaPlayer::SupportsType MediaPlayerPrivateQTKit::supportsType(const MediaEngineSupportParameters& parameters)
</span><span class="cx"> {
</span><del>-#if ENABLE(ENCRYPTED_MEDIA)
- // QTKit does not support any encrytped media, so return IsNotSupported if the keySystem is non-NULL:
- if (!parameters.keySystem.isNull() && !parameters.keySystem.isEmpty())
- return MediaPlayer::IsNotSupported;
-#endif
-
</del><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><span class="cx"> if (parameters.isMediaSource)
</span><span class="cx"> return MediaPlayer::IsNotSupported;
</span></span></pre></div>
<a id="trunkSourceWebCoretestingMockCDMh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/MockCDM.h (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/MockCDM.h 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Source/WebCore/testing/MockCDM.h 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -55,6 +55,6 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // ENABLE(ENCRYPTED_MEDIA)
</del><ins>+#endif // ENABLE(ENCRYPTED_MEDIA_V2)
</ins><span class="cx">
</span><span class="cx"> #endif // MockCDM_h
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-09-27 Jer Noble <jer.noble@apple.com>
+
+ Remove deprecated ENCRYPTED_MEDIA implementation.
+ https://bugs.webkit.org/show_bug.cgi?id=161010
+
+ Remove ENABLE_ENCRYPTED_MEDIA.
+
+ Reviewed by Eric Carlson.
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2016-09-26 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename IOS_TEXT_AUTOSIZING to TEXT_AUTOSIZING
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -75,7 +75,6 @@
</span><span class="cx"> ENABLE_DETAILS_ELEMENT = ENABLE_DETAILS_ELEMENT;
</span><span class="cx"> ENABLE_DEVICE_ORIENTATION[sdk=iphone*] = ENABLE_DEVICE_ORIENTATION;
</span><span class="cx"> ENABLE_DOM4_EVENTS_CONSTRUCTOR = ENABLE_DOM4_EVENTS_CONSTRUCTOR;
</span><del>-ENABLE_ENCRYPTED_MEDIA[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA;
</del><span class="cx"> ENABLE_ENCRYPTED_MEDIA_V2[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA_V2;
</span><span class="cx"> ENABLE_FETCH_API = ENABLE_FETCH_API;
</span><span class="cx"> ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
</span><span class="lines">@@ -200,5 +199,4 @@
</span><span class="cx"> ENABLE_FTL_JIT[sdk=iphoneos*] = ENABLE_FTL_JIT;
</span><span class="cx">
</span><span class="cx"> ENABLE_CUSTOM_ELEMENTS = ENABLE_CUSTOM_ELEMENTS;
</span><del>-
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_ELEMENTS) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENAB
LE_ENCRYPTED_MEDIA_V2) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ES6_MODULES) $(ENABLE_ES2017_ASYNCFUNCTION_SYNTAX) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_ME
DIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB
_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT);
</del><ins>+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_ELEMENTS) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUC
TOR) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_ES6_MODULES) $(ENABLE_ES2017_ASYNCFUNCTION_SYNTAX) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(
ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENA
BLE_WEB_TIMING) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT);
</ins></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMHTMLMediaElement.h (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMHTMLMediaElement.h 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Source/WebKit/mac/DOM/DOMHTMLMediaElement.h 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> @property (copy) NSString *mediaGroup;
</span><span class="cx">
</span><span class="cx"> - (void)load;
</span><del>-- (NSString *)canPlayType:(NSString *)type keySystem:(NSString *)keySystem;
</del><ins>+- (NSString *)canPlayType:(NSString *)type;
</ins><span class="cx"> - (NSTimeInterval)getStartDate;
</span><span class="cx"> - (void)play;
</span><span class="cx"> - (void)pause;
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMHTMLMediaElementmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMHTMLMediaElement.mm (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMHTMLMediaElement.mm 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Source/WebKit/mac/DOM/DOMHTMLMediaElement.mm 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -308,10 +308,10 @@
</span><span class="cx"> IMPL->load();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (NSString *)canPlayType:(NSString *)type keySystem:(NSString *)keySystem
</del><ins>+- (NSString *)canPlayType:(NSString *)type
</ins><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- return IMPL->canPlayType(type, keySystem);
</del><ins>+ return IMPL->canPlayType(type);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSTimeInterval)getStartDate
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Source/WebKit2/ChangeLog 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-09-27 Jer Noble <jer.noble@apple.com>
+
+ Remove deprecated ENCRYPTED_MEDIA implementation.
+ https://bugs.webkit.org/show_bug.cgi?id=161010
+
+ Reviewed by Eric Carlson.
+
+ Remove ENABLE_ENCRYPTED_MEDIA.
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2016-09-27 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2] Navigating to a Blob URL does not trigger a download
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -75,7 +75,6 @@
</span><span class="cx"> ENABLE_DETAILS_ELEMENT = ENABLE_DETAILS_ELEMENT;
</span><span class="cx"> ENABLE_DEVICE_ORIENTATION[sdk=iphone*] = ENABLE_DEVICE_ORIENTATION;
</span><span class="cx"> ENABLE_DOM4_EVENTS_CONSTRUCTOR = ENABLE_DOM4_EVENTS_CONSTRUCTOR;
</span><del>-ENABLE_ENCRYPTED_MEDIA[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA;
</del><span class="cx"> ENABLE_ENCRYPTED_MEDIA_V2[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA_V2;
</span><span class="cx"> ENABLE_FETCH_API = ENABLE_FETCH_API;
</span><span class="cx"> ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
</span><span class="lines">@@ -201,4 +200,4 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_CUSTOM_ELEMENTS = ENABLE_CUSTOM_ELEMENTS;
</span><span class="cx">
</span><del>-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_ELEMENTS) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRU
CTOR) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ES6_MODULES) $(ENABLE_ES2017_ASYNCFUNCTION_SYNTAX) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT)
$(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY)
$(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT);
</del><ins>+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_ELEMENTS) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUC
TOR) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_ES6_MODULES) $(ENABLE_ES2017_ASYNCFUNCTION_SYNTAX) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(
ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENA
BLE_WEB_TIMING) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT);
</ins></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Tools/ChangeLog 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-09-27 Jer Noble <jer.noble@apple.com>
+
+ Remove deprecated ENCRYPTED_MEDIA implementation.
+ https://bugs.webkit.org/show_bug.cgi?id=161010
+
+ Reviewed by Eric Carlson.
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2016-09-27 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2] Navigating to a Blob URL does not trigger a download
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (206439 => 206440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2016-09-27 16:58:41 UTC (rev 206439)
+++ trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2016-09-27 17:14:32 UTC (rev 206440)
</span><span class="lines">@@ -75,7 +75,6 @@
</span><span class="cx"> ENABLE_DETAILS_ELEMENT = ENABLE_DETAILS_ELEMENT;
</span><span class="cx"> ENABLE_DEVICE_ORIENTATION[sdk=iphone*] = ENABLE_DEVICE_ORIENTATION;
</span><span class="cx"> ENABLE_DOM4_EVENTS_CONSTRUCTOR = ENABLE_DOM4_EVENTS_CONSTRUCTOR;
</span><del>-ENABLE_ENCRYPTED_MEDIA[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA;
</del><span class="cx"> ENABLE_ENCRYPTED_MEDIA_V2[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA_V2;
</span><span class="cx"> ENABLE_FETCH_API = ENABLE_FETCH_API;
</span><span class="cx"> ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
</span><span class="lines">@@ -201,4 +200,4 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_CUSTOM_ELEMENTS = ENABLE_CUSTOM_ELEMENTS;
</span><span class="cx">
</span><del>-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_ELEMENTS) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRU
CTOR) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ES6_MODULES) $(ENABLE_ES2017_ASYNCFUNCTION_SYNTAX) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $
(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WE
B_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT);
</del><ins>+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_ELEMENTS) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUC
TOR) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_ES6_MODULES) $(ENABLE_ES2017_ASYNCFUNCTION_SYNTAX) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRI
PT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_READABLE_STREAM_API) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLA
Y) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_WRITABLE_STREAM_API) $(ENABLE_XSLT);
</ins></span></pre>
</div>
</div>
</body>
</html>