<!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>[206811] 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/206811">206811</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2016-10-05 09:02:35 -0700 (Wed, 05 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename ENABLE_ENCRYPTED_MEDIA_V2 to ENABLE_LEGACY_ENCRYPTED_MEDIA
https://bugs.webkit.org/show_bug.cgi?id=162903
Reviewed by Alex Christensen.
Rename build guards for the remaining implementation of the legacy EME API
to ENABLE_LEGACY_ENCRYPTED_MEDIA. This will allow for the future implementation
of the near-finished API to be guarded with the simple ENABLE_ENCRYPTED_MEDIA guards.
.:
* Source/cmake/OptionsEfl.cmake:
* Source/cmake/OptionsMac.cmake:
* Source/cmake/OptionsWin.cmake:
* Source/cmake/WebKitFeatures.cmake:
* Source/cmake/tools/vsprops/FeatureDefines.props:
* Source/cmake/tools/vsprops/FeatureDefinesCairo.props:
Source/JavaScriptCore:
* Configurations/FeatureDefines.xcconfig:
Source/WebCore:
No new tests -- no change in behavior.
* CMakeLists.txt:
* Configurations/FeatureDefines.xcconfig:
* DerivedSources.cpp:
* DerivedSources.make:
* Modules/encryptedmedia/CDM.cpp:
* Modules/encryptedmedia/CDM.h:
* Modules/encryptedmedia/CDMPrivate.h:
* Modules/encryptedmedia/CDMPrivateClearKey.cpp:
* Modules/encryptedmedia/CDMPrivateClearKey.h:
* Modules/encryptedmedia/CDMPrivateMediaPlayer.cpp:
* Modules/encryptedmedia/CDMPrivateMediaPlayer.h:
* Modules/encryptedmedia/CDMSessionClearKey.cpp:
* Modules/encryptedmedia/CDMSessionClearKey.h:
* Modules/encryptedmedia/MediaKeyMessageEvent.cpp:
* Modules/encryptedmedia/MediaKeyMessageEvent.h:
* Modules/encryptedmedia/MediaKeyMessageEvent.idl:
* Modules/encryptedmedia/MediaKeyNeededEvent.cpp:
* Modules/encryptedmedia/MediaKeyNeededEvent.h:
* Modules/encryptedmedia/MediaKeyNeededEvent.idl:
* Modules/encryptedmedia/MediaKeySession.cpp:
* Modules/encryptedmedia/MediaKeySession.h:
* Modules/encryptedmedia/MediaKeySession.idl:
* Modules/encryptedmedia/MediaKeys.cpp:
* Modules/encryptedmedia/MediaKeys.h:
* Modules/encryptedmedia/MediaKeys.idl:
* bindings/js/JSDictionary.cpp:
* bindings/js/JSDictionary.h:
* dom/Element.idl:
* dom/EventNames.in:
* dom/EventTargetFactory.in:
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::~HTMLMediaElement):
(WebCore::HTMLMediaElement::webkitGenerateKeyRequest):
(WebCore::HTMLMediaElement::webkitAddKey):
* html/HTMLMediaElement.h:
* html/HTMLMediaElement.idl:
* html/MediaError.h:
* html/MediaError.idl:
* html/MediaKeyError.h:
* html/MediaKeyError.idl:
* page/Settings.h:
* platform/graphics/CDMSession.h:
* platform/graphics/MediaPlayer.cpp:
* platform/graphics/MediaPlayer.h:
* platform/graphics/MediaPlayerPrivate.h:
* platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.h:
* platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.mm:
* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
* platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp:
* platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.h:
* platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
(WebCore::MediaPlayerPrivateAVFoundationCF::supportsKeySystem):
(WebCore::AVFWrapper::shouldWaitForLoadingOfResource):
* platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h:
* platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.h:
* platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm:
* platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.h:
* platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm:
* platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.h:
* platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.mm:
* platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h:
* platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::supportsKeySystem):
(WebCore::MediaPlayerPrivateAVFoundationObjC::shouldWaitForLoadingOfResource):
(WebCore::playerKVOProperties):
(-[WebCoreAVFMovieObserver observeValueForKeyPath:ofObject:change:context:]):
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
* platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.h:
* platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.mm:
* platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
(WebCore::SourceBufferPrivateAVFObjC::willProvideContentKeyRequestInitializationDataForTrackID):
(WebCore::SourceBufferPrivateAVFObjC::didProvideContentKeyRequestInitializationDataForTrackID):
* testing/Internals.cpp:
* testing/Internals.h:
* testing/Internals.idl:
* testing/MockCDM.cpp:
* testing/MockCDM.h:
Source/WebKit/mac:
* Configurations/FeatureDefines.xcconfig:
* WebView/WebPreferences.mm:
(+[WebPreferences initialize]):
* WebView/WebView.mm:
(-[WebView _preferencesChanged:]):
Source/WebKit2:
* Configurations/FeatureDefines.xcconfig:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::m_userInterfaceLayoutDirection):
* WebProcess/WebProcess.cpp:
(WebKit::m_resourceLoadStatisticsStorage):
Source/WTF:
* wtf/FeatureDefines.h:
Tools:
* TestWebKitAPI/Configurations/FeatureDefines.xcconfig: Also remove the
ENABLE_IOS_TEXT_AUTOSIZING feature define that was renamed in <a href="http://trac.webkit.org/projects/webkit/changeset/206395">r206395</a> and was
throwing up style checker errors.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</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="#trunkSourceWebCoreDerivedSourcescpp">trunk/Source/WebCore/DerivedSources.cpp</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesmake">trunk/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaCDMcpp">trunk/Source/WebCore/Modules/encryptedmedia/CDM.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaCDMh">trunk/Source/WebCore/Modules/encryptedmedia/CDM.h</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaCDMPrivateh">trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivate.h</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaCDMPrivateClearKeycpp">trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivateClearKey.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaCDMPrivateClearKeyh">trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivateClearKey.h</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaCDMPrivateMediaPlayercpp">trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivateMediaPlayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaCDMPrivateMediaPlayerh">trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivateMediaPlayer.h</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaCDMSessionClearKeycpp">trunk/Source/WebCore/Modules/encryptedmedia/CDMSessionClearKey.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaCDMSessionClearKeyh">trunk/Source/WebCore/Modules/encryptedmedia/CDMSessionClearKey.h</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaMediaKeyMessageEventcpp">trunk/Source/WebCore/Modules/encryptedmedia/MediaKeyMessageEvent.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaMediaKeyMessageEventh">trunk/Source/WebCore/Modules/encryptedmedia/MediaKeyMessageEvent.h</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaMediaKeyMessageEventidl">trunk/Source/WebCore/Modules/encryptedmedia/MediaKeyMessageEvent.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaMediaKeyNeededEventcpp">trunk/Source/WebCore/Modules/encryptedmedia/MediaKeyNeededEvent.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaMediaKeyNeededEventh">trunk/Source/WebCore/Modules/encryptedmedia/MediaKeyNeededEvent.h</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaMediaKeyNeededEventidl">trunk/Source/WebCore/Modules/encryptedmedia/MediaKeyNeededEvent.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaMediaKeySessioncpp">trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaMediaKeySessionh">trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaMediaKeySessionidl">trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaMediaKeyscpp">trunk/Source/WebCore/Modules/encryptedmedia/MediaKeys.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaMediaKeysh">trunk/Source/WebCore/Modules/encryptedmedia/MediaKeys.h</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaMediaKeysidl">trunk/Source/WebCore/Modules/encryptedmedia/MediaKeys.idl</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="#trunkSourceWebCoredomEventTargetFactoryin">trunk/Source/WebCore/dom/EventTargetFactory.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="#trunkSourceWebCorepageSettingsh">trunk/Source/WebCore/page/Settings.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsCDMSessionh">trunk/Source/WebCore/platform/graphics/CDMSession.h</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="#trunkSourceWebCoreplatformgraphicsavfoundationCDMPrivateMediaSourceAVFObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationCDMPrivateMediaSourceAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.mm</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="#trunkSourceWebCoreplatformgraphicsavfoundationcfCDMSessionAVFoundationCFcpp">trunk/Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationcfCDMSessionAVFoundationCFh">trunk/Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationcfMediaPlayerPrivateAVFoundationCFcpp">trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationcfMediaPlayerPrivateAVFoundationCFh">trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionAVContentKeySessionh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionAVContentKeySessionmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionAVFoundationObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionAVStreamSessionh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionAVStreamSessionmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionMediaSourceAVFObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionMediaSourceAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.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="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaSourcePrivateAVFObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaSourcePrivateAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcSourceBufferPrivateAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsh">trunk/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsidl">trunk/Source/WebCore/testing/Internals.idl</a></li>
<li><a href="#trunkSourceWebCoretestingMockCDMcpp">trunk/Source/WebCore/testing/MockCDM.cpp</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="#trunkSourceWebKitmacWebViewWebPreferencesmm">trunk/Source/WebKit/mac/WebView/WebPreferences.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.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="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
<li><a href="#trunkSourcecmakeOptionsEflcmake">trunk/Source/cmake/OptionsEfl.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsMaccmake">trunk/Source/cmake/OptionsMac.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsWincmake">trunk/Source/cmake/OptionsWin.cmake</a></li>
<li><a href="#trunkSourcecmakeWebKitFeaturescmake">trunk/Source/cmake/WebKitFeatures.cmake</a></li>
<li><a href="#trunkSourcecmaketoolsvspropsFeatureDefinesprops">trunk/Source/cmake/tools/vsprops/FeatureDefines.props</a></li>
<li><a href="#trunkSourcecmaketoolsvspropsFeatureDefinesCairoprops">trunk/Source/cmake/tools/vsprops/FeatureDefinesCairo.props</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPIConfigurationsFeatureDefinesxcconfig">trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/ChangeLog 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-10-05 Zan Dobersek <zdobersek@igalia.com>
+
+ Rename ENABLE_ENCRYPTED_MEDIA_V2 to ENABLE_LEGACY_ENCRYPTED_MEDIA
+ https://bugs.webkit.org/show_bug.cgi?id=162903
+
+ Reviewed by Alex Christensen.
+
+ Rename build guards for the remaining implementation of the legacy EME API
+ to ENABLE_LEGACY_ENCRYPTED_MEDIA. This will allow for the future implementation
+ of the near-finished API to be guarded with the simple ENABLE_ENCRYPTED_MEDIA guards.
+
+ * Source/cmake/OptionsEfl.cmake:
+ * Source/cmake/OptionsMac.cmake:
+ * Source/cmake/OptionsWin.cmake:
+ * Source/cmake/WebKitFeatures.cmake:
+ * Source/cmake/tools/vsprops/FeatureDefines.props:
+ * Source/cmake/tools/vsprops/FeatureDefinesCairo.props:
+
</ins><span class="cx"> 2016-10-03 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [SOUP] Cleanup persistent credential storage code
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-10-05 Zan Dobersek <zdobersek@igalia.com>
+
+ Rename ENABLE_ENCRYPTED_MEDIA_V2 to ENABLE_LEGACY_ENCRYPTED_MEDIA
+ https://bugs.webkit.org/show_bug.cgi?id=162903
+
+ Reviewed by Alex Christensen.
+
+ Rename build guards for the remaining implementation of the legacy EME API
+ to ENABLE_LEGACY_ENCRYPTED_MEDIA. This will allow for the future implementation
+ of the near-finished API to be guarded with the simple ENABLE_ENCRYPTED_MEDIA guards.
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2016-10-05 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> ARM EABI buildfix after r206778
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2016-10-05 16:02:35 UTC (rev 206811)
</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_V2[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA_V2;
</del><span class="cx"> ENABLE_FETCH_API = ENABLE_FETCH_API;
</span><span class="cx"> ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
</span><span class="cx"> ENABLE_FONT_LOAD_EVENTS = ;
</span><span class="lines">@@ -124,6 +123,7 @@
</span><span class="cx"> ENABLE_IOS_TOUCH_EVENTS_ios_WITH_INTERNAL_SDK_YES = ENABLE_IOS_TOUCH_EVENTS;
</span><span class="cx">
</span><span class="cx"> ENABLE_LEGACY_CSS_VENDOR_PREFIXES = ENABLE_LEGACY_CSS_VENDOR_PREFIXES;
</span><ins>+ENABLE_LEGACY_ENCRYPTED_MEDIA[sdk=macosx*] = ENABLE_LEGACY_ENCRYPTED_MEDIA;
</ins><span class="cx"> ENABLE_LEGACY_NOTIFICATIONS[sdk=macosx*] = ENABLE_LEGACY_NOTIFICATIONS;
</span><span class="cx"> ENABLE_LEGACY_VENDOR_PREFIXES = ENABLE_LEGACY_VENDOR_PREFIXES;
</span><span class="cx"> ENABLE_LETTERPRESS[sdk=iphone*] = ENABLE_LETTERPRESS;
</span><span class="lines">@@ -200,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_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) $(EN
ABLE_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_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_ENCRYPTED_MEDIA) $(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);
</ins></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WTF/ChangeLog 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-10-05 Zan Dobersek <zdobersek@igalia.com>
+
+ Rename ENABLE_ENCRYPTED_MEDIA_V2 to ENABLE_LEGACY_ENCRYPTED_MEDIA
+ https://bugs.webkit.org/show_bug.cgi?id=162903
+
+ Reviewed by Alex Christensen.
+
+ Rename build guards for the remaining implementation of the legacy EME API
+ to ENABLE_LEGACY_ENCRYPTED_MEDIA. This will allow for the future implementation
+ of the near-finished API to be guarded with the simple ENABLE_ENCRYPTED_MEDIA guards.
+
+ * wtf/FeatureDefines.h:
+
</ins><span class="cx"> 2016-10-04 Saam Barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> String.prototype.toLowerCase should be a DFG/FTL intrinsic
</span></span></pre></div>
<a id="trunkSourceWTFwtfFeatureDefinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FeatureDefines.h (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FeatureDefines.h 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WTF/wtf/FeatureDefines.h 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -177,8 +177,8 @@
</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_V2)
-#define ENABLE_ENCRYPTED_MEDIA_V2 1
</del><ins>+#if !defined(ENABLE_LEGACY_ENCRYPTED_MEDIA)
+#define ENABLE_LEGACY_ENCRYPTED_MEDIA 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !defined(ENABLE_FULLSCREEN_API)
</span><span class="lines">@@ -441,8 +441,8 @@
</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_V2)
-#define ENABLE_ENCRYPTED_MEDIA_V2 0
</del><ins>+#if !defined(ENABLE_LEGACY_ENCRYPTED_MEDIA)
+#define ENABLE_LEGACY_ENCRYPTED_MEDIA 0
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !defined(ENABLE_FETCH_API)
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -2986,7 +2986,7 @@
</span><span class="cx"> JavaScriptCore${DEBUG_SUFFIX}
</span><span class="cx"> )
</span><span class="cx">
</span><del>-if (ENABLE_ENCRYPTED_MEDIA_V2)
</del><ins>+if (ENABLE_LEGACY_ENCRYPTED_MEDIA)
</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></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/ChangeLog 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -1,3 +1,98 @@
</span><ins>+2016-10-05 Zan Dobersek <zdobersek@igalia.com>
+
+ Rename ENABLE_ENCRYPTED_MEDIA_V2 to ENABLE_LEGACY_ENCRYPTED_MEDIA
+ https://bugs.webkit.org/show_bug.cgi?id=162903
+
+ Reviewed by Alex Christensen.
+
+ Rename build guards for the remaining implementation of the legacy EME API
+ to ENABLE_LEGACY_ENCRYPTED_MEDIA. This will allow for the future implementation
+ of the near-finished API to be guarded with the simple ENABLE_ENCRYPTED_MEDIA guards.
+
+ No new tests -- no change in behavior.
+
+ * CMakeLists.txt:
+ * Configurations/FeatureDefines.xcconfig:
+ * DerivedSources.cpp:
+ * DerivedSources.make:
+ * Modules/encryptedmedia/CDM.cpp:
+ * Modules/encryptedmedia/CDM.h:
+ * Modules/encryptedmedia/CDMPrivate.h:
+ * Modules/encryptedmedia/CDMPrivateClearKey.cpp:
+ * Modules/encryptedmedia/CDMPrivateClearKey.h:
+ * Modules/encryptedmedia/CDMPrivateMediaPlayer.cpp:
+ * Modules/encryptedmedia/CDMPrivateMediaPlayer.h:
+ * Modules/encryptedmedia/CDMSessionClearKey.cpp:
+ * Modules/encryptedmedia/CDMSessionClearKey.h:
+ * Modules/encryptedmedia/MediaKeyMessageEvent.cpp:
+ * Modules/encryptedmedia/MediaKeyMessageEvent.h:
+ * Modules/encryptedmedia/MediaKeyMessageEvent.idl:
+ * Modules/encryptedmedia/MediaKeyNeededEvent.cpp:
+ * Modules/encryptedmedia/MediaKeyNeededEvent.h:
+ * Modules/encryptedmedia/MediaKeyNeededEvent.idl:
+ * Modules/encryptedmedia/MediaKeySession.cpp:
+ * Modules/encryptedmedia/MediaKeySession.h:
+ * Modules/encryptedmedia/MediaKeySession.idl:
+ * Modules/encryptedmedia/MediaKeys.cpp:
+ * Modules/encryptedmedia/MediaKeys.h:
+ * Modules/encryptedmedia/MediaKeys.idl:
+ * bindings/js/JSDictionary.cpp:
+ * bindings/js/JSDictionary.h:
+ * dom/Element.idl:
+ * dom/EventNames.in:
+ * dom/EventTargetFactory.in:
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::~HTMLMediaElement):
+ (WebCore::HTMLMediaElement::webkitGenerateKeyRequest):
+ (WebCore::HTMLMediaElement::webkitAddKey):
+ * html/HTMLMediaElement.h:
+ * html/HTMLMediaElement.idl:
+ * html/MediaError.h:
+ * html/MediaError.idl:
+ * html/MediaKeyError.h:
+ * html/MediaKeyError.idl:
+ * page/Settings.h:
+ * platform/graphics/CDMSession.h:
+ * platform/graphics/MediaPlayer.cpp:
+ * platform/graphics/MediaPlayer.h:
+ * platform/graphics/MediaPlayerPrivate.h:
+ * platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.h:
+ * platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.mm:
+ * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
+ * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
+ * platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp:
+ * platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.h:
+ * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
+ (WebCore::MediaPlayerPrivateAVFoundationCF::supportsKeySystem):
+ (WebCore::AVFWrapper::shouldWaitForLoadingOfResource):
+ * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h:
+ * platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.h:
+ * platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm:
+ * platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.h:
+ * platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm:
+ * platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.h:
+ * platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.mm:
+ * platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h:
+ * platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::supportsKeySystem):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::shouldWaitForLoadingOfResource):
+ (WebCore::playerKVOProperties):
+ (-[WebCoreAVFMovieObserver observeValueForKeyPath:ofObject:change:context:]):
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+ * platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.h:
+ * platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.mm:
+ * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
+ (WebCore::SourceBufferPrivateAVFObjC::willProvideContentKeyRequestInitializationDataForTrackID):
+ (WebCore::SourceBufferPrivateAVFObjC::didProvideContentKeyRequestInitializationDataForTrackID):
+ * testing/Internals.cpp:
+ * testing/Internals.h:
+ * testing/Internals.idl:
+ * testing/MockCDM.cpp:
+ * testing/MockCDM.h:
+
</ins><span class="cx"> 2016-10-05 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Do not follow redirects when sending violation report
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2016-10-05 16:02:35 UTC (rev 206811)
</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_V2[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA_V2;
</del><span class="cx"> ENABLE_FETCH_API = ENABLE_FETCH_API;
</span><span class="cx"> ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
</span><span class="cx"> ENABLE_FONT_LOAD_EVENTS = ;
</span><span class="lines">@@ -124,6 +123,7 @@
</span><span class="cx"> ENABLE_IOS_TOUCH_EVENTS_ios_WITH_INTERNAL_SDK_YES = ENABLE_IOS_TOUCH_EVENTS;
</span><span class="cx">
</span><span class="cx"> ENABLE_LEGACY_CSS_VENDOR_PREFIXES = ENABLE_LEGACY_CSS_VENDOR_PREFIXES;
</span><ins>+ENABLE_LEGACY_ENCRYPTED_MEDIA[sdk=macosx*] = ENABLE_LEGACY_ENCRYPTED_MEDIA;
</ins><span class="cx"> ENABLE_LEGACY_NOTIFICATIONS[sdk=macosx*] = ENABLE_LEGACY_NOTIFICATIONS;
</span><span class="cx"> ENABLE_LEGACY_VENDOR_PREFIXES = ENABLE_LEGACY_VENDOR_PREFIXES;
</span><span class="cx"> ENABLE_LETTERPRESS[sdk=iphone*] = ENABLE_LETTERPRESS;
</span><span class="lines">@@ -200,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_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) $(EN
ABLE_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_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_ENCRYPTED_MEDIA) $(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);
</ins></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.cpp (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.cpp 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/DerivedSources.cpp 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -325,7 +325,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> #include "JSMediaError.cpp"
</span><span class="cx"> #include "JSMediaList.cpp"
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> #include "JSMediaKeyError.cpp"
</span><span class="cx"> #include "JSMediaKeyMessageEvent.cpp"
</span><span class="cx"> #include "JSMediaKeyNeededEvent.cpp"
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/DerivedSources.make 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -1056,8 +1056,8 @@
</span><span class="cx"> HTML_FLAGS := $(HTML_FLAGS) ENABLE_DETAILS_ELEMENT=1
</span><span class="cx"> endif
</span><span class="cx">
</span><del>-ifeq ($(findstring ENABLE_ENCRYPTED_MEDIA_V2,$(FEATURE_DEFINES)), ENABLE_ENCRYPTED_MEDIA_V2)
- HTML_FLAGS := $(HTML_FLAGS) ENABLE_ENCRYPTED_MEDIA_V2=1
</del><ins>+ifeq ($(findstring ENABLE_LEGACY_ENCRYPTED_MEDIA,$(FEATURE_DEFINES)), ENABLE_LEGACY_ENCRYPTED_MEDIA)
+ HTML_FLAGS := $(HTML_FLAGS) ENABLE_LEGACY_ENCRYPTED_MEDIA=1
</ins><span class="cx"> endif
</span><span class="cx">
</span><span class="cx"> ifeq ($(findstring ENABLE_METER_ELEMENT,$(FEATURE_DEFINES)), ENABLE_METER_ELEMENT)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaCDMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/CDM.cpp (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/CDM.cpp 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/Modules/encryptedmedia/CDM.cpp 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx">
</span><span class="cx"> #include "CDM.h"
</span><span class="cx">
</span><span class="lines">@@ -149,4 +149,4 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#endif // ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaCDMh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/CDM.h (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/CDM.h 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/Modules/encryptedmedia/CDM.h 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef CDM_h
</span><span class="cx"> #define CDM_h
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx">
</span><span class="cx"> #include "CDMSession.h"
</span><span class="cx"> #include <runtime/Uint8Array.h>
</span><span class="lines">@@ -79,6 +79,6 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#endif // ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx">
</span><span class="cx"> #endif // CDM_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaCDMPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivate.h (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivate.h 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivate.h 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef CDMPrivate_h
</span><span class="cx"> #define CDMPrivate_h
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx">
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -47,6 +47,6 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#endif // ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx">
</span><span class="cx"> #endif // CDMPrivate_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaCDMPrivateClearKeycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivateClearKey.cpp (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivateClearKey.cpp 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivateClearKey.cpp 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "CDMPrivateClearKey.h"
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx">
</span><span class="cx"> #include "CDM.h"
</span><span class="cx"> #include "CDMSessionClearKey.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaCDMPrivateClearKeyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivateClearKey.h (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivateClearKey.h 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivateClearKey.h 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef CDMPrivateClearKey_h
</span><span class="cx"> #define CDMPrivateClearKey_h
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx">
</span><span class="cx"> #include "CDMPrivate.h"
</span><span class="cx">
</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_V2)
</del><ins>+#endif // ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx">
</span><span class="cx"> #endif // CDMPrivateClearKey_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaCDMPrivateMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivateMediaPlayer.cpp (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivateMediaPlayer.cpp 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivateMediaPlayer.cpp 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "CDMPrivateMediaPlayer.h"
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx">
</span><span class="cx"> #include "CDM.h"
</span><span class="cx"> #include "CDMSession.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaCDMPrivateMediaPlayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivateMediaPlayer.h (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivateMediaPlayer.h 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivateMediaPlayer.h 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "CDMPrivate.h"
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaCDMSessionClearKeycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/CDMSessionClearKey.cpp (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/CDMSessionClearKey.cpp 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/Modules/encryptedmedia/CDMSessionClearKey.cpp 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/text/Base64.h>
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx">
</span><span class="cx"> using namespace JSC;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaCDMSessionClearKeyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/CDMSessionClearKey.h (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/CDMSessionClearKey.h 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/Modules/encryptedmedia/CDMSessionClearKey.h 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include "CDMSession.h"
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -56,6 +56,6 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#endif // ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx">
</span><span class="cx"> #endif // CDMSessionClearKey_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaMediaKeyMessageEventcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/MediaKeyMessageEvent.cpp (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/MediaKeyMessageEvent.cpp 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/Modules/encryptedmedia/MediaKeyMessageEvent.cpp 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx">
</span><span class="cx"> #include "MediaKeyMessageEvent.h"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaMediaKeyMessageEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/MediaKeyMessageEvent.h (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/MediaKeyMessageEvent.h 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/Modules/encryptedmedia/MediaKeyMessageEvent.h 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #ifndef MediaKeyMessageEvent_h
</span><span class="cx"> #define MediaKeyMessageEvent_h
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx">
</span><span class="cx"> #include "Event.h"
</span><span class="cx"> #include "MediaKeyError.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaMediaKeyMessageEventidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/MediaKeyMessageEvent.idl (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/MediaKeyMessageEvent.idl 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/Modules/encryptedmedia/MediaKeyMessageEvent.idl 2016-10-05 16:02:35 UTC (rev 206811)
</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_V2,
</del><ins>+ Conditional=LEGACY_ENCRYPTED_MEDIA,
</ins><span class="cx"> ConstructorTemplate=Event,
</span><span class="cx"> InterfaceName=WebKitMediaKeyMessageEvent
</span><span class="cx"> ] interface MediaKeyMessageEvent : Event {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaMediaKeyNeededEventcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/MediaKeyNeededEvent.cpp (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/MediaKeyNeededEvent.cpp 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/Modules/encryptedmedia/MediaKeyNeededEvent.cpp 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx">
</span><span class="cx"> #include "MediaKeyNeededEvent.h"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaMediaKeyNeededEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/MediaKeyNeededEvent.h (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/MediaKeyNeededEvent.h 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/Modules/encryptedmedia/MediaKeyNeededEvent.h 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef MediaKeyNeededEvent_h
</span><span class="cx"> #define MediaKeyNeededEvent_h
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx">
</span><span class="cx"> #include "Event.h"
</span><span class="cx"> #include "MediaKeyError.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaMediaKeyNeededEventidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/MediaKeyNeededEvent.idl (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/MediaKeyNeededEvent.idl 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/Modules/encryptedmedia/MediaKeyNeededEvent.idl 2016-10-05 16:02:35 UTC (rev 206811)
</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_V2,
</del><ins>+ Conditional=LEGACY_ENCRYPTED_MEDIA,
</ins><span class="cx"> ConstructorTemplate=Event
</span><span class="cx"> ] interface MediaKeyNeededEvent : Event {
</span><span class="cx"> readonly attribute Uint8Array initData;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaMediaKeySessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "MediaKeySession.h"
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx">
</span><span class="cx"> #include "CDM.h"
</span><span class="cx"> #include "CDMSession.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaMediaKeySessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef MediaKeySession_h
</span><span class="cx"> #define MediaKeySession_h
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx">
</span><span class="cx"> #include "ActiveDOMObject.h"
</span><span class="cx"> #include "CDMSession.h"
</span><span class="lines">@@ -117,6 +117,6 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#endif // ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx">
</span><span class="cx"> #endif // MediaKeySession_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaMediaKeySessionidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.idl (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.idl 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.idl 2016-10-05 16:02:35 UTC (rev 206811)
</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_V2,
</del><ins>+ Conditional=LEGACY_ENCRYPTED_MEDIA,
</ins><span class="cx"> InterfaceName=WebKitMediaKeySession,
</span><span class="cx"> ActiveDOMObject,
</span><span class="cx"> ] interface MediaKeySession : EventTarget {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaMediaKeyscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/MediaKeys.cpp (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/MediaKeys.cpp 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/Modules/encryptedmedia/MediaKeys.cpp 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "MediaKeys.h"
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx">
</span><span class="cx"> #include "CDM.h"
</span><span class="cx"> #include "EventNames.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaMediaKeysh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/MediaKeys.h (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/MediaKeys.h 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/Modules/encryptedmedia/MediaKeys.h 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef MediaKeys_h
</span><span class="cx"> #define MediaKeys_h
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx">
</span><span class="cx"> #include "CDM.h"
</span><span class="cx"> #include "EventTarget.h"
</span><span class="lines">@@ -74,6 +74,6 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#endif // ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx">
</span><span class="cx"> #endif // MediaKeys_h
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaMediaKeysidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/MediaKeys.idl (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/MediaKeys.idl 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/Modules/encryptedmedia/MediaKeys.idl 2016-10-05 16:02:35 UTC (rev 206811)
</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_V2,
</del><ins>+ Conditional=LEGACY_ENCRYPTED_MEDIA,
</ins><span class="cx"> Constructor(DOMString keySystem),
</span><span class="cx"> ConstructorMayThrowLegacyException,
</span><span class="cx"> InterfaceName=WebKitMediaKeys,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDictionarycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDictionary.cpp (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDictionary.cpp 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/bindings/js/JSDictionary.cpp 2016-10-05 16:02:35 UTC (rev 206811)
</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_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> #include "JSMediaKeyError.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -256,7 +256,7 @@
</span><span class="cx"> result = toUint8Array(value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</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 (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDictionary.h 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/bindings/js/JSDictionary.h 2016-10-05 16:02:35 UTC (rev 206811)
</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_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</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 (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.idl 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/dom/Element.idl 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -173,7 +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_V2] attribute EventHandler onwebkitneedkey;
</del><ins>+ [NotEnumerable, Conditional=LEGACY_ENCRYPTED_MEDIA] 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 (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/EventNames.in 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/dom/EventNames.in 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -56,8 +56,8 @@
</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>-MediaKeyMessageEvent conditional=ENCRYPTED_MEDIA_V2
-MediaKeyNeededEvent conditional=ENCRYPTED_MEDIA_V2
</del><ins>+MediaKeyMessageEvent conditional=LEGACY_ENCRYPTED_MEDIA
+MediaKeyNeededEvent conditional=LEGACY_ENCRYPTED_MEDIA
</ins><span class="cx"> TrackEvent conditional=VIDEO_TRACK
</span><span class="cx"> AutocompleteErrorEvent conditional=REQUEST_AUTOCOMPLETE
</span><span class="cx"> CSSFontFaceLoadEvent conditional=FONT_LOAD_EVENTS
</span></span></pre></div>
<a id="trunkSourceWebCoredomEventTargetFactoryin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/EventTargetFactory.in (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/EventTargetFactory.in 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/dom/EventTargetFactory.in 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> IDBOpenDBRequest conditional=INDEXED_DATABASE
</span><span class="cx"> IDBRequest conditional=INDEXED_DATABASE
</span><span class="cx"> IDBTransaction conditional=INDEXED_DATABASE
</span><del>-MediaKeySession conditional=ENCRYPTED_MEDIA_V2
</del><ins>+MediaKeySession conditional=LEGACY_ENCRYPTED_MEDIA
</ins><span class="cx"> MediaController conditional=VIDEO
</span><span class="cx"> MediaRemoteControls conditional=MEDIA_SESSION
</span><span class="cx"> MediaSource conditional=MEDIA_SOURCE
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> #include "MediaStreamRegistry.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> #include "MediaKeyNeededEvent.h"
</span><span class="cx"> #include "MediaKeys.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -582,7 +582,7 @@
</span><span class="cx"> detachMediaSource();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> setMediaKeys(0);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -2432,7 +2432,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> RefPtr<ArrayBuffer> HTMLMediaElement::mediaPlayerCachedKeyForKeyId(const String& keyId) const
</span><span class="cx"> {
</span><span class="cx"> return m_mediaKeys ? m_mediaKeys->cachedKeyForKeyId(keyId) : nullptr;
</span><span class="lines">@@ -3243,7 +3243,7 @@
</span><span class="cx"> #if ENABLE(ENCRYPTED_MEDIA)
</span><span class="cx"> void HTMLMediaElement::webkitGenerateKeyRequest(const String& keySystem, const RefPtr<Uint8Array>& initData, ExceptionCode& ec)
</span><span class="cx"> {
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> static bool firstTime = true;
</span><span class="cx"> if (firstTime && scriptExecutionContext()) {
</span><span class="cx"> scriptExecutionContext()->addConsoleMessage(MessageSource::JS, MessageLevel::Warning, ASCIILiteral("'HTMLMediaElement.webkitGenerateKeyRequest()' is deprecated. Use 'MediaKeys.createSession()' instead."));
</span><span class="lines">@@ -3274,7 +3274,7 @@
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::webkitAddKey(const String& keySystem, Uint8Array& key, const RefPtr<Uint8Array>& initData, const String& sessionId, ExceptionCode& ec)
</span><span class="cx"> {
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> static bool firstTime = true;
</span><span class="cx"> if (firstTime && scriptExecutionContext()) {
</span><span class="cx"> scriptExecutionContext()->addConsoleMessage(MessageSource::JS, MessageLevel::Warning, ASCIILiteral("'HTMLMediaElement.webkitAddKey()' is deprecated. Use 'MediaKeySession.update()' instead."));
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -248,7 +248,7 @@
</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_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> MediaKeys* keys() const { return m_mediaKeys.get(); }
</span><span class="cx"> void setMediaKeys(MediaKeys*);
</span><span class="cx">
</span><span class="lines">@@ -568,7 +568,7 @@
</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_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> RefPtr<ArrayBuffer> mediaPlayerCachedKeyForKeyId(const String& keyId) const override;
</span><span class="cx"> bool mediaPlayerKeyNeeded(MediaPlayer*, Uint8Array*) override;
</span><span class="cx"> String mediaPlayerMediaKeysStorageDirectory() const override;
</span><span class="lines">@@ -998,7 +998,7 @@
</span><span class="cx">
</span><span class="cx"> friend class TrackDisplayUpdateScope;
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> RefPtr<MediaKeys> m_mediaKeys;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.idl (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.idl 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/html/HTMLMediaElement.idl 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -91,8 +91,8 @@
</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_V2, ImplementedAs=keys] readonly attribute MediaKeys webkitKeys;
- [Conditional=ENCRYPTED_MEDIA_V2, ImplementedAs=setMediaKeys] void webkitSetMediaKeys(MediaKeys? mediaKeys);
</del><ins>+ [Conditional=LEGACY_ENCRYPTED_MEDIA, ImplementedAs=keys] readonly attribute MediaKeys webkitKeys;
+ [Conditional=LEGACY_ENCRYPTED_MEDIA, ImplementedAs=setMediaKeys] void webkitSetMediaKeys(MediaKeys? mediaKeys);
</ins><span class="cx">
</span><span class="cx"> [Conditional=VIDEO_TRACK, MayThrowLegacyException] TextTrack addTextTrack(DOMString kind, optional DOMString label = "", optional DOMString language = "");
</span><span class="cx"> [Conditional=VIDEO_TRACK] readonly attribute AudioTrackList audioTracks;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaErrorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaError.h (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaError.h 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/html/MediaError.h 2016-10-05 16:02:35 UTC (rev 206811)
</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_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</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 (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaError.idl 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/html/MediaError.idl 2016-10-05 16:02:35 UTC (rev 206811)
</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_V2) && ENABLE_ENCRYPTED_MEDIA_V2)
</del><ins>+#if (defined(ENABLE_LEGACY_ENCRYPTED_MEDIA) && ENABLE_LEGACY_ENCRYPTED_MEDIA)
</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 (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaKeyError.h 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/html/MediaKeyError.h 2016-10-05 16:02:35 UTC (rev 206811)
</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_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</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 (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaKeyError.idl 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/html/MediaKeyError.idl 2016-10-05 16:02:35 UTC (rev 206811)
</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_V2,
</del><ins>+ Conditional=LEGACY_ENCRYPTED_MEDIA,
</ins><span class="cx"> ImplementationLacksVTable,
</span><span class="cx"> InterfaceName=WebKitMediaKeyError
</span><span class="cx"> ] interface MediaKeyError {
</span><span class="lines">@@ -35,5 +35,5 @@
</span><span class="cx"> const unsigned short MEDIA_KEYERR_HARDWARECHANGE = 5;
</span><span class="cx"> const unsigned short MEDIA_KEYERR_DOMAIN = 6;
</span><span class="cx"> readonly attribute unsigned short code;
</span><del>- [Conditional=ENCRYPTED_MEDIA_V2] readonly attribute unsigned long systemCode;
</del><ins>+ [Conditional=LEGACY_ENCRYPTED_MEDIA] readonly attribute unsigned long systemCode;
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.h (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.h 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/page/Settings.h 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -279,7 +279,7 @@
</span><span class="cx"> static bool shouldManageAudioSessionCategory() { return gManageAudioSession; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> void setMediaKeysStorageDirectory(const String& directory) { m_mediaKeysStorageDirectory = directory; }
</span><span class="cx"> const String& mediaKeysStorageDirectory() const { return m_mediaKeysStorageDirectory; }
</span><span class="cx"> #endif
</span><span class="lines">@@ -383,7 +383,7 @@
</span><span class="cx"> WEBCORE_EXPORT static bool gManageAudioSession;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> String m_mediaKeysStorageDirectory;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsCDMSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/CDMSession.h (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/CDMSession.h 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/platform/graphics/CDMSession.h 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef CDMSession_h
</span><span class="cx"> #define CDMSession_h
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx">
</span><span class="cx"> #include <runtime/Uint8Array.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="lines">@@ -78,6 +78,6 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#endif // ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx">
</span><span class="cx"> #endif // CDMSession_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -537,7 +537,7 @@
</span><span class="cx"> m_private->setShouldBufferData(shouldBuffer);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> std::unique_ptr<CDMSession> MediaPlayer::createSession(const String& keySystem, CDMSessionClient* client)
</span><span class="cx"> {
</span><span class="cx"> return m_private->createSession(keySystem, client);
</span><span class="lines">@@ -1167,7 +1167,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // WEB_AUDIO
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> RefPtr<ArrayBuffer> MediaPlayer::cachedKeyForKeyId(const String& keyId) const
</span><span class="cx"> {
</span><span class="cx"> return m_client.mediaPlayerCachedKeyForKeyId(keyId);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -201,7 +201,7 @@
</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_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><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="cx"> virtual String mediaPlayerMediaKeysStorageDirectory() const { return emptyString(); }
</span><span class="lines">@@ -341,7 +341,7 @@
</span><span class="cx"> void pause();
</span><span class="cx"> void setShouldBufferData(bool);
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</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><span class="lines">@@ -509,7 +509,7 @@
</span><span class="cx"> AudioSourceProvider* audioSourceProvider();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> RefPtr<ArrayBuffer> cachedKeyForKeyId(const String& keyId) const;
</span><span class="cx"> bool keyNeeded(Uint8Array* initData);
</span><span class="cx"> String mediaKeysStorageDirectory() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx"> virtual AudioSourceProvider* audioSourceProvider() { return 0; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> virtual std::unique_ptr<CDMSession> createSession(const String&, CDMSessionClient*) { return nullptr; }
</span><span class="cx"> virtual void setCDMSession(CDMSession*) { }
</span><span class="cx"> virtual void keyAdded() { }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationCDMPrivateMediaSourceAVFObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.h (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.h 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.h 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef CDMPrivateMediaSourceAVFObjC_h
</span><span class="cx"> #define CDMPrivateMediaSourceAVFObjC_h
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2) && ENABLE(MEDIA_SOURCE)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA) && ENABLE(MEDIA_SOURCE)
</ins><span class="cx">
</span><span class="cx"> #include "CDMPrivate.h"
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="lines">@@ -60,6 +60,6 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // ENABLE(ENCRYPTED_MEDIA_V2) && ENABLE(MEDIA_SOURCE)
</del><ins>+#endif // ENABLE(LEGACY_ENCRYPTED_MEDIA) && ENABLE(MEDIA_SOURCE)
</ins><span class="cx">
</span><span class="cx"> #endif // CDMPrivateMediaSourceAVFObjC_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationCDMPrivateMediaSourceAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.mm (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.mm 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.mm 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "CDMPrivateMediaSourceAVFObjC.h"
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2) && ENABLE(MEDIA_SOURCE)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA) && ENABLE(MEDIA_SOURCE)
</ins><span class="cx">
</span><span class="cx"> #import "CDM.h"
</span><span class="cx"> #import "CDMSessionAVContentKeySession.h"
</span><span class="lines">@@ -130,4 +130,4 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // ENABLE(ENCRYPTED_MEDIA_V2) && ENABLE(MEDIA_SOURCE)
</del><ins>+#endif // ENABLE(LEGACY_ENCRYPTED_MEDIA) && ENABLE(MEDIA_SOURCE)
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2016-10-05 16:02:35 UTC (rev 206811)
</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_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</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 (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h 2016-10-05 16:02:35 UTC (rev 206811)
</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_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</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="trunkSourceWebCoreplatformgraphicsavfoundationcfCDMSessionAVFoundationCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "CDMSessionAVFoundationCF.h"
</span><span class="cx">
</span><del>-#if HAVE(AVFOUNDATION_LOADER_DELEGATE) && ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if HAVE(AVFOUNDATION_LOADER_DELEGATE) && ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx">
</span><span class="cx"> #include "CDM.h"
</span><span class="cx"> #include "CDMSession.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationcfCDMSessionAVFoundationCFh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.h (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.h 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.h 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include "CDMSession.h"
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><del>-#if HAVE(AVFOUNDATION_LOADER_DELEGATE) && ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if HAVE(AVFOUNDATION_LOADER_DELEGATE) && ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx">
</span><span class="cx"> typedef struct OpaqueAVCFAssetResourceLoadingRequest* AVCFAssetResourceLoadingRequestRef;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationcfMediaPlayerPrivateAVFoundationCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> #include <d3d9.h>
</span><span class="cx"> #include <delayimp.h>
</span><span class="cx"> #include <dispatch/dispatch.h>
</span><del>-#if HAVE(AVFOUNDATION_LOADER_DELEGATE) && ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if HAVE(AVFOUNDATION_LOADER_DELEGATE) && ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> #include <runtime/DataView.h>
</span><span class="cx"> #include <runtime/Uint16Array.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> inline dispatch_queue_t dispatchQueue() const { return m_notificationQueue; }
</span><span class="cx">
</span><del>-#if HAVE(AVFOUNDATION_LOADER_DELEGATE) && ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if HAVE(AVFOUNDATION_LOADER_DELEGATE) && ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> RetainPtr<AVCFAssetResourceLoadingRequestRef> takeRequestForKeyURI(const String&);
</span><span class="cx"> void setRequestForKey(const String& keyURI, AVCFAssetResourceLoadingRequestRef avRequest);
</span><span class="cx"> #endif
</span><span class="lines">@@ -872,7 +872,7 @@
</span><span class="cx"> m_videoFrameHasDrawn = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if HAVE(AVFOUNDATION_LOADER_DELEGATE) && ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if HAVE(AVFOUNDATION_LOADER_DELEGATE) && ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx">
</span><span class="cx"> static bool keySystemIsSupported(const String& keySystem)
</span><span class="cx"> {
</span><span class="lines">@@ -926,7 +926,7 @@
</span><span class="cx">
</span><span class="cx"> bool MediaPlayerPrivateAVFoundationCF::supportsKeySystem(const String& keySystem, const String& mimeType)
</span><span class="cx"> {
</span><del>-#if HAVE(AVFOUNDATION_LOADER_DELEGATE) && ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if HAVE(AVFOUNDATION_LOADER_DELEGATE) && ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> if (keySystem.isEmpty())
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -1112,7 +1112,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if HAVE(AVFOUNDATION_LOADER_DELEGATE) && ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if HAVE(AVFOUNDATION_LOADER_DELEGATE) && ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> RetainPtr<AVCFAssetResourceLoadingRequestRef> MediaPlayerPrivateAVFoundationCF::takeRequestForKeyURI(const String& keyURI)
</span><span class="cx"> {
</span><span class="cx"> if (!m_avfWrapper)
</span><span class="lines">@@ -1128,7 +1128,7 @@
</span><span class="cx">
</span><span class="cx"> return std::make_unique<CDMSessionAVFoundationCF>(this, client);
</span><span class="cx"> }
</span><del>-#elif ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#elif ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> std::unique_ptr<CDMSession> MediaPlayerPrivateAVFoundationCF::createSession(const String& keySystem, , CDMSessionClient*)
</span><span class="cx"> {
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -1858,7 +1858,7 @@
</span><span class="cx">
</span><span class="cx"> bool AVFWrapper::shouldWaitForLoadingOfResource(AVCFAssetResourceLoadingRequestRef avRequest)
</span><span class="cx"> {
</span><del>-#if HAVE(AVFOUNDATION_LOADER_DELEGATE) && ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if HAVE(AVFOUNDATION_LOADER_DELEGATE) && ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> RetainPtr<CFURLRequestRef> urlRequest = AVCFAssetResourceLoadingRequestGetURLRequest(avRequest);
</span><span class="cx"> RetainPtr<CFURLRef> requestURL = CFURLRequestGetURL(urlRequest.get());
</span><span class="cx"> RetainPtr<CFStringRef> schemeRef = adoptCF(CFURLCopyScheme(requestURL.get()));
</span><span class="lines">@@ -2055,7 +2055,7 @@
</span><span class="cx"> // FIXME: <rdar://problem/14884340>
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if HAVE(AVFOUNDATION_LOADER_DELEGATE) && ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if HAVE(AVFOUNDATION_LOADER_DELEGATE) && ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> void AVFWrapper::setRequestForKey(const String& keyURI, AVCFAssetResourceLoadingRequestRef avRequest)
</span><span class="cx"> {
</span><span class="cx"> auto requestsIterator = m_keyURIToRequestMap.find(keyURI);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationcfMediaPlayerPrivateAVFoundationCFh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include "MediaPlayerPrivateAVFoundation.h"
</span><span class="cx">
</span><del>-#if HAVE(AVFOUNDATION_LOADER_DELEGATE) || HAVE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if HAVE(AVFOUNDATION_LOADER_DELEGATE) || HAVE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> typedef struct OpaqueAVCFAssetResourceLoadingRequest* AVCFAssetResourceLoadingRequestRef;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> void didCancelLoadingRequest(AVCFAssetResourceLoadingRequestRef);
</span><span class="cx"> void didStopLoadingRequest(AVCFAssetResourceLoadingRequestRef);
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> RetainPtr<AVCFAssetResourceLoadingRequestRef> takeRequestForKeyURI(const String&);
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void contentsNeedsDisplay();
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> std::unique_ptr<CDMSession> createSession(const String&, CDMSessionClient*) override;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionAVContentKeySessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.h (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.h 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.h 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include "SourceBufferPrivateAVFObjC.h"
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2) && ENABLE(MEDIA_SOURCE)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA) && ENABLE(MEDIA_SOURCE)
</ins><span class="cx">
</span><span class="cx"> OBJC_CLASS AVContentKeyRequest;
</span><span class="cx"> OBJC_CLASS AVContentKeySession;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionAVContentKeySessionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "CDMSessionAVContentKeySession.h"
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2) && ENABLE(MEDIA_SOURCE)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA) && ENABLE(MEDIA_SOURCE)
</ins><span class="cx">
</span><span class="cx"> #import "CDM.h"
</span><span class="cx"> #import "CDMPrivateMediaSourceAVFObjC.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionAVFoundationObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.h (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.h 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.h 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #include <wtf/WeakPtr.h>
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx">
</span><span class="cx"> OBJC_CLASS AVAssetResourceLoadingRequest;
</span><span class="cx"> OBJC_CLASS WebCDMSessionAVFoundationObjCListener;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "CDMSessionAVFoundationObjC.h"
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx">
</span><span class="cx"> #import "CDM.h"
</span><span class="cx"> #import "CDMSession.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionAVStreamSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.h (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.h 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.h 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #include <wtf/WeakPtr.h>
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2) && ENABLE(MEDIA_SOURCE)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA) && ENABLE(MEDIA_SOURCE)
</ins><span class="cx">
</span><span class="cx"> OBJC_CLASS AVStreamSession;
</span><span class="cx"> OBJC_CLASS WebCDMSessionAVStreamSessionObserver;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionAVStreamSessionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.mm (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.mm 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.mm 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "CDMSessionAVStreamSession.h"
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2) && ENABLE(MEDIA_SOURCE)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA) && ENABLE(MEDIA_SOURCE)
</ins><span class="cx">
</span><span class="cx"> #import "AVFoundationSPI.h"
</span><span class="cx"> #import "CDM.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionMediaSourceAVFObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #include <wtf/WeakPtr.h>
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2) && ENABLE(MEDIA_SOURCE)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA) && ENABLE(MEDIA_SOURCE)
</ins><span class="cx">
</span><span class="cx"> OBJC_CLASS AVStreamDataParser;
</span><span class="cx"> OBJC_CLASS NSError;
</span><span class="lines">@@ -82,6 +82,6 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // ENABLE(ENCRYPTED_MEDIA_V2) && ENABLE(MEDIA_SOURCE)
</del><ins>+#endif // ENABLE(LEGACY_ENCRYPTED_MEDIA) && ENABLE(MEDIA_SOURCE)
</ins><span class="cx">
</span><span class="cx"> #endif // CDMSessionMediaSourceAVFObjC_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionMediaSourceAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "CDMSessionMediaSourceAVFObjC.h"
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2) && ENABLE(MEDIA_SOURCE)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA) && ENABLE(MEDIA_SOURCE)
</ins><span class="cx">
</span><span class="cx"> #import "CDMPrivateMediaSourceAVFObjC.h"
</span><span class="cx"> #import "FileSystem.h"
</span><span class="lines">@@ -103,4 +103,4 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // ENABLE(ENCRYPTED_MEDIA_V2) && ENABLE(MEDIA_SOURCE)
</del><ins>+#endif // ENABLE(LEGACY_ENCRYPTED_MEDIA) && ENABLE(MEDIA_SOURCE)
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> void didStopLoadingRequest(AVAssetResourceLoadingRequest *);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> RetainPtr<AVAssetResourceLoadingRequest> takeRequestForKeyURI(const String&);
</span><span class="cx"> void keyAdded() override;
</span><span class="cx"> #endif
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> void playbackTargetIsWirelessDidChange();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> void outputObscuredDueToInsufficientExternalProtectionChanged(bool);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx"> void synchronizeTextTrackState() override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> void removeSession(CDMSession&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -275,7 +275,7 @@
</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_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> std::unique_ptr<CDMSession> createSession(const String& keySystem, CDMSessionClient*) override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -398,7 +398,7 @@
</span><span class="cx"> RefPtr<MediaPlaybackTarget> m_playbackTarget { nullptr };
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> WeakPtr<CDMSessionAVFoundationObjC> m_session;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2016-10-05 16:02:35 UTC (rev 206811)
</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_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</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">@@ -1691,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_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</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">@@ -1716,7 +1716,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if HAVE(AVFOUNDATION_LOADER_DELEGATE)
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> static void fulfillRequestWithKeyData(AVAssetResourceLoadingRequest *request, ArrayBuffer* keyData)
</span><span class="cx"> {
</span><span class="cx"> if (AVAssetResourceLoadingContentInformationRequest *infoRequest = [request contentInformationRequest]) {
</span><span class="lines">@@ -1749,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_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</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">@@ -2461,7 +2461,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> RetainPtr<AVAssetResourceLoadingRequest> MediaPlayerPrivateAVFoundationObjC::takeRequestForKeyURI(const String& keyURI)
</span><span class="cx"> {
</span><span class="cx"> return m_keyURIToRequestMap.take(keyURI);
</span><span class="lines">@@ -3209,7 +3209,7 @@
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx"> @"externalPlaybackActive", @"allowsExternalPlayback",
</span><span class="cx"> #endif
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> @"outputObscuredDueToInsufficientExternalProtection",
</span><span class="cx"> #endif
</span><span class="cx"> nil];
</span><span class="lines">@@ -3334,7 +3334,7 @@
</span><span class="cx"> else if ([keyPath isEqualToString:@"externalPlaybackActive"] || [keyPath isEqualToString:@"allowsExternalPlayback"])
</span><span class="cx"> function = std::bind(&MediaPlayerPrivateAVFoundationObjC::playbackTargetIsWirelessDidChange, m_callback);
</span><span class="cx"> #endif
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> else if ([keyPath isEqualToString:@"outputObscuredDueToInsufficientExternalProtection"])
</span><span class="cx"> function = std::bind(&MediaPlayerPrivateAVFoundationObjC::outputObscuredDueToInsufficientExternalProtectionChanged, m_callback, [newValue boolValue]);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> void setVideoFullscreenFrame(FloatRect) override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> bool hasStreamSession() { return m_streamSession; }
</span><span class="cx"> AVStreamSession *streamSession();
</span><span class="cx"> void setCDMSession(CDMSession*) override;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -705,7 +705,7 @@
</span><span class="cx"> m_sizeChangeObserverWeakPtrFactory.revokeAll();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> AVStreamSession* MediaPlayerPrivateMediaSourceAVFObjC::streamSession()
</span><span class="cx"> {
</span><span class="cx"> if (!getAVStreamSessionClass() || ![getAVStreamSessionClass() instancesRespondToSelector:@selector(initWithStorageDirectoryAtURL:)])
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaSourcePrivateAVFObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.h (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.h 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.h 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx">
</span><span class="cx"> void sourceBufferPrivateDidChangeActiveState(SourceBufferPrivateAVFObjC*, bool active);
</span><span class="cx"> void sourceBufferPrivateDidReceiveInitializationSegment(SourceBufferPrivateAVFObjC*);
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> void sourceBufferKeyNeeded(SourceBufferPrivateAVFObjC*, Uint8Array*);
</span><span class="cx"> #endif
</span><span class="cx"> void monitorSourceBuffers();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaSourcePrivateAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.mm (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.mm 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.mm 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> void MediaSourcePrivateAVFObjC::sourceBufferKeyNeeded(SourceBufferPrivateAVFObjC* buffer, Uint8Array* initData)
</span><span class="cx"> {
</span><span class="cx"> m_sourceBuffersNeedingSessions.append(buffer);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcSourceBufferPrivateAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -578,7 +578,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(m_parser);
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> LOG(MediaSource, "SourceBufferPrivateAVFObjC::willProvideContentKeyRequestInitializationDataForTrackID(%p) - track:%d", this, trackID);
</span><span class="cx"> m_protectedTrackID = trackID;
</span><span class="cx">
</span><span class="lines">@@ -600,7 +600,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> UNUSED_PARAM(trackID);
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> LOG(MediaSource, "SourceBufferPrivateAVFObjC::didProvideContentKeyRequestInitializationDataForTrackID(%p) - track:%d", this, trackID);
</span><span class="cx"> m_protectedTrackID = trackID;
</span><span class="cx"> RefPtr<Uint8Array> initDataArray = Uint8Array::create([initData length]);
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/testing/Internals.cpp 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> #include <wtf/dtoa.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> #include "CDM.h"
</span><span class="cx"> #include "MockCDM.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -2558,7 +2558,7 @@
</span><span class="cx"> document->view()->enableAutoSizeMode(enabled, IntSize(minimumWidth, minimumHeight), IntSize(maximumWidth, maximumHeight));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> void Internals::initializeMockCDM()
</span><span class="cx"> {
</span><span class="cx"> CDM::registerCDMFactory([](CDM* cdm) { return std::make_unique<MockCDM>(cdm); },
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/testing/Internals.h 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -353,7 +353,7 @@
</span><span class="cx">
</span><span class="cx"> void enableAutoSizeMode(bool enabled, int minimumWidth, int minimumHeight, int maximumWidth, int maximumHeight);
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> void initializeMockCDM();
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/testing/Internals.idl 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -360,7 +360,7 @@
</span><span class="cx"> [Conditional=VIDEO] void simulateAudioInterruption(HTMLMediaElement element);
</span><span class="cx"> [Conditional=VIDEO, MayThrowLegacyException] boolean mediaElementHasCharacteristic(HTMLMediaElement element, DOMString characteristic);
</span><span class="cx">
</span><del>- [Conditional=ENCRYPTED_MEDIA_V2] void initializeMockCDM();
</del><ins>+ [Conditional=LEGACY_ENCRYPTED_MEDIA] void initializeMockCDM();
</ins><span class="cx">
</span><span class="cx"> [Conditional=SPEECH_SYNTHESIS] void enableMockSpeechSynthesizer();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoretestingMockCDMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/MockCDM.cpp (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/MockCDM.cpp 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/testing/MockCDM.cpp 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "MockCDM.h"
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx">
</span><span class="cx"> #include "CDM.h"
</span><span class="cx"> #include "CDMSession.h"
</span><span class="lines">@@ -141,4 +141,4 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#endif // ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins></span></pre></div>
<a id="trunkSourceWebCoretestingMockCDMh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/MockCDM.h (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/MockCDM.h 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebCore/testing/MockCDM.h 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef MockCDM_h
</span><span class="cx"> #define MockCDM_h
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx">
</span><span class="cx"> #include "CDMPrivate.h"
</span><span class="cx">
</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_V2)
</del><ins>+#endif // ENABLE(LEGACY_ENCRYPTED_MEDIA)
</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 (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-10-05 Zan Dobersek <zdobersek@igalia.com>
+
+ Rename ENABLE_ENCRYPTED_MEDIA_V2 to ENABLE_LEGACY_ENCRYPTED_MEDIA
+ https://bugs.webkit.org/show_bug.cgi?id=162903
+
+ Reviewed by Alex Christensen.
+
+ Rename build guards for the remaining implementation of the legacy EME API
+ to ENABLE_LEGACY_ENCRYPTED_MEDIA. This will allow for the future implementation
+ of the near-finished API to be guarded with the simple ENABLE_ENCRYPTED_MEDIA guards.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]):
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]):
+
</ins><span class="cx"> 2016-10-04 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> The dragged image should be the current frame only of the animated image
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2016-10-05 16:02:35 UTC (rev 206811)
</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_V2[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA_V2;
</del><span class="cx"> ENABLE_FETCH_API = ENABLE_FETCH_API;
</span><span class="cx"> ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
</span><span class="cx"> ENABLE_FONT_LOAD_EVENTS = ;
</span><span class="lines">@@ -124,6 +123,7 @@
</span><span class="cx"> ENABLE_IOS_TOUCH_EVENTS_ios_WITH_INTERNAL_SDK_YES = ENABLE_IOS_TOUCH_EVENTS;
</span><span class="cx">
</span><span class="cx"> ENABLE_LEGACY_CSS_VENDOR_PREFIXES = ENABLE_LEGACY_CSS_VENDOR_PREFIXES;
</span><ins>+ENABLE_LEGACY_ENCRYPTED_MEDIA[sdk=macosx*] = ENABLE_LEGACY_ENCRYPTED_MEDIA;
</ins><span class="cx"> ENABLE_LEGACY_NOTIFICATIONS[sdk=macosx*] = ENABLE_LEGACY_NOTIFICATIONS;
</span><span class="cx"> ENABLE_LEGACY_VENDOR_PREFIXES = ENABLE_LEGACY_VENDOR_PREFIXES;
</span><span class="cx"> ENABLE_LETTERPRESS[sdk=iphone*] = ENABLE_LETTERPRESS;
</span><span class="lines">@@ -199,4 +199,5 @@
</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_CONSTRU
CTOR) $(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) $(EN
ABLE_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_CONSTRUCTOR) $(ENAB
LE_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_ENCRYPTED_MEDIA) $(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);
</ins></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -600,7 +600,7 @@
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitServiceControlsEnabledPreferenceKey,
</span><span class="cx"> #endif
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitEnableInheritURIQueryComponentPreferenceKey,
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> @"~/Library/WebKit/MediaKeys", WebKitMediaKeysStorageDirectoryKey,
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -2569,7 +2569,7 @@
</span><span class="cx"> [WAKView _setInterpolationQuality:[preferences _interpolationQuality]];
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> settings.setMediaKeysStorageDirectory([preferences mediaKeysStorageDirectory]);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebKit2/ChangeLog 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-10-05 Zan Dobersek <zdobersek@igalia.com>
+
+ Rename ENABLE_ENCRYPTED_MEDIA_V2 to ENABLE_LEGACY_ENCRYPTED_MEDIA
+ https://bugs.webkit.org/show_bug.cgi?id=162903
+
+ Reviewed by Alex Christensen.
+
+ Rename build guards for the remaining implementation of the legacy EME API
+ to ENABLE_LEGACY_ENCRYPTED_MEDIA. This will allow for the future implementation
+ of the near-finished API to be guarded with the simple ENABLE_ENCRYPTED_MEDIA guards.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::m_userInterfaceLayoutDirection):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::m_resourceLoadStatisticsStorage):
+
</ins><span class="cx"> 2016-10-05 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2][NetworkSession] Ping requests should follow redirects if applicable
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2016-10-05 16:02:35 UTC (rev 206811)
</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_V2[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA_V2;
</del><span class="cx"> ENABLE_FETCH_API = ENABLE_FETCH_API;
</span><span class="cx"> ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
</span><span class="cx"> ENABLE_FONT_LOAD_EVENTS = ;
</span><span class="lines">@@ -124,6 +123,7 @@
</span><span class="cx"> ENABLE_IOS_TOUCH_EVENTS_ios_WITH_INTERNAL_SDK_YES = ENABLE_IOS_TOUCH_EVENTS;
</span><span class="cx">
</span><span class="cx"> ENABLE_LEGACY_CSS_VENDOR_PREFIXES = ENABLE_LEGACY_CSS_VENDOR_PREFIXES;
</span><ins>+ENABLE_LEGACY_ENCRYPTED_MEDIA[sdk=macosx*] = ENABLE_LEGACY_ENCRYPTED_MEDIA;
</ins><span class="cx"> ENABLE_LEGACY_NOTIFICATIONS[sdk=macosx*] = ENABLE_LEGACY_NOTIFICATIONS;
</span><span class="cx"> ENABLE_LEGACY_VENDOR_PREFIXES = ENABLE_LEGACY_VENDOR_PREFIXES;
</span><span class="cx"> ENABLE_LETTERPRESS[sdk=iphone*] = ENABLE_LETTERPRESS;
</span><span class="lines">@@ -200,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_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) $(EN
ABLE_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_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_ENCRYPTED_MEDIA) $(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);
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -558,7 +558,7 @@
</span><span class="cx"> m_mimeTypesWithCustomContentProviders.add(mimeType);
</span><span class="cx">
</span><span class="cx">
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> if (WebMediaKeyStorageManager* manager = webProcess.supplement<WebMediaKeyStorageManager>())
</span><span class="cx"> m_page->settings().setMediaKeysStorageDirectory(manager->mediaKeyStorageDirectory());
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> #if ENABLE(BATTERY_STATUS)
</span><span class="cx"> addSupplement<WebBatteryManager>();
</span><span class="cx"> #endif
</span><del>-#if ENABLE(ENCRYPTED_MEDIA_V2)
</del><ins>+#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
</ins><span class="cx"> addSupplement<WebMediaKeyStorageManager>();
</span><span class="cx"> #endif
</span><span class="cx"> m_plugInAutoStartOriginHashes.add(SessionID::defaultSessionID(), HashMap<unsigned, double>());
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsEfl.cmake (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsEfl.cmake 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/cmake/OptionsEfl.cmake 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -95,7 +95,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOM4_EVENTS_CONSTRUCTOR PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOWNLOAD_ATTRIBUTE PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT PUBLIC ON)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA_V2 PUBLIC ON)
</del><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FILTERS_LEVEL_2 PUBLIC OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT PUBLIC ${ENABLE_FTL_DEFAULT})
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FULLSCREEN_API PUBLIC ON)
</span><span class="lines">@@ -105,6 +104,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE_IN_WORKERS PUBLIC OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR PUBLIC ON)
</span><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_ENCRYPTED_MEDIA PUBLIC ON)
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LINK_PREFETCH PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CAPTURE PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CONTROLS_SCRIPT PUBLIC ON)
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsMac.cmake (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsMac.cmake 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/cmake/OptionsMac.cmake 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATA_TRANSFER_ITEMS PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DETAILS_ELEMENT PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOM4_EVENTS_CONSTRUCTOR PRIVATE ON)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA_V2 PRIVATE ON)
</del><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FILTERS_LEVEL_2 PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FONT_LOAD_EVENTS PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FULLSCREEN_API PRIVATE ON)
</span><span class="lines">@@ -53,6 +52,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_MONTH PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_TIME PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_CSS_VENDOR_PREFIXES PRIVATE ON)
</span><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_ENCRYPTED_MEDIA PRIVATE ON)
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_NOTIFICATIONS PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_VENDOR_PREFIXES PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LETTERPRESS PRIVATE ON)
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsWin.cmake (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsWin.cmake 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/cmake/OptionsWin.cmake 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -74,11 +74,11 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_SYSTEM_MALLOC PRIVATE ON)
</span><span class="cx">
</span><span class="cx"> if (${WTF_PLATFORM_WIN_CAIRO})
</span><del>- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA_V2 PUBLIC OFF)
</del><ins>+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_ENCRYPTED_MEDIA PUBLIC OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTL PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL PUBLIC ON)
</span><span class="cx"> else ()
</span><del>- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA_V2 PUBLIC ON)
</del><ins>+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_ENCRYPTED_MEDIA PUBLIC ON)
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTL PUBLIC OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL PUBLIC OFF)
</span><span class="cx"> endif ()
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitFeaturescmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitFeatures.cmake (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitFeatures.cmake 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -109,7 +109,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_DOM4_EVENTS_CONSTRUCTOR "Toggle DOM4 Events constructors" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_DOWNLOAD_ATTRIBUTE "Toggle download attribute support" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_DRAG_SUPPORT "Toggle Drag Support" PRIVATE OFF)
</span><del>- WEBKIT_OPTION_DEFINE(ENABLE_ENCRYPTED_MEDIA_V2 "Support EME v2" PRIVATE OFF)
</del><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_ES6_MODULES "Toggle ES6 modules support" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_ES2017_ASYNCFUNCTION_SYNTAX "Toggle ES2017 async functions support" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_FETCH_API "Toggle Fetch API support" PRIVATE ON)
</span><span class="lines">@@ -138,6 +137,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_IOS_AIRPLAY "Toggle iOS airplay support" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_JIT "Enable JustInTime javascript support" PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_LEGACY_CSS_VENDOR_PREFIXES "Toggle legacy css vendor prefix support" PRIVATE OFF)
</span><ins>+ WEBKIT_OPTION_DEFINE(ENABLE_LEGACY_ENCRYPTED_MEDIA "Support legacy EME" PRIVATE OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_LEGACY_NOTIFICATIONS "Toggle Legacy Desktop Notifications Support" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_LEGACY_VENDOR_PREFIXES "Toggle Legacy Vendor Prefix Support" PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_LETTERPRESS "Toggle letterpress support" PRIVATE OFF)
</span><span class="lines">@@ -206,7 +206,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFINE(USE_SYSTEM_MALLOC "Toggle system allocator instead of WebKit's custom allocator" PRIVATE OFF)
</span><span class="cx">
</span><span class="cx"> WEBKIT_OPTION_DEPEND(ENABLE_WEB_RTC ENABLE_MEDIA_STREAM)
</span><del>- WEBKIT_OPTION_DEPEND(ENABLE_ENCRYPTED_MEDIA_V2 ENABLE_VIDEO)
</del><ins>+ WEBKIT_OPTION_DEPEND(ENABLE_LEGACY_ENCRYPTED_MEDIA ENABLE_VIDEO)
</ins><span class="cx"> WEBKIT_OPTION_DEPEND(ENABLE_DFG_JIT ENABLE_JIT)
</span><span class="cx"> WEBKIT_OPTION_DEPEND(ENABLE_FTL_JIT ENABLE_DFG_JIT)
</span><span class="cx"> WEBKIT_OPTION_DEPEND(ENABLE_SAMPLING_PROFILER ENABLE_JIT)
</span></span></pre></div>
<a id="trunkSourcecmaketoolsvspropsFeatureDefinesprops"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/tools/vsprops/FeatureDefines.props (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/tools/vsprops/FeatureDefines.props 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/cmake/tools/vsprops/FeatureDefines.props 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> <ENABLE_DEVICE_ORIENTATION />
</span><span class="cx"> <ENABLE_DIRECTORY_UPLOAD />
</span><span class="cx"> <ENABLE_DOM4_EVENTS_CONSTRUCTOR>ENABLE_DOM4_EVENTS_CONSTRUCTOR</ENABLE_DOM4_EVENTS_CONSTRUCTOR>
</span><del>- <ENABLE_ENCRYPTED_MEDIA_V2>ENABLE_ENCRYPTED_MEDIA_V2</ENABLE_ENCRYPTED_MEDIA_V2>
</del><span class="cx"> <ENABLE_ES6_MODULES />
</span><span class="cx"> <ENABLE_FETCH_API />
</span><span class="cx"> <ENABLE_FILE_SYSTEM />
</span><span class="lines">@@ -50,6 +49,7 @@
</span><span class="cx"> <ENABLE_INPUT_TYPE_WEEK />
</span><span class="cx"> <ENABLE_INTL>ENABLE_INTL</ENABLE_INTL>
</span><span class="cx"> <ENABLE_LEGACY_CSS_VENDOR_PREFIXES>ENABLE_LEGACY_CSS_VENDOR_PREFIXES</ENABLE_LEGACY_CSS_VENDOR_PREFIXES>
</span><ins>+ <ENABLE_LEGACY_ENCRYPTED_MEDIA>ENABLE_LEGACY_ENCRYPTED_MEDIA</ENABLE_LEGACY_ENCRYPTED_MEDIA>
</ins><span class="cx"> <ENABLE_LEGACY_NOTIFICATIONS />
</span><span class="cx"> <ENABLE_LINK_PREFETCH />
</span><span class="cx"> <ENABLE_LINK_PRERENDER />
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <ItemDefinitionGroup>
</span><span class="cx"> <ClCompile>
</span><del>- <PreprocessorDefinitions>$(ENABLE_CSP_NEXT);$(ENABLE_PROMISES);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_TRANSFORMS);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_ATTACHMENT_ELEMENT);$(ENABLE_CANVAS_PATH);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPES);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CURSOR_VISIBILITY);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM4_EVENTS_CONSTRUCTOR);$(ENABLE_ENCRYPTED_MEDIA_V2);$(ENABLE_ES6_MODULES);$(ENABLE_FETCH_API);
$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(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_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_NAVIGATOR_CONTENT_UTILS);$(ENABLE_READABLE_STREAM_API);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENA
BLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_WEB_ANIMATIONS);$(ENABLE_WEB_AUDIO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WEBGL);$(ENABLE_WEBVTT_REGIONS);$(ENABLE_WRITABLE_STREAM_API);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
</del><ins>+ <PreprocessorDefinitions>$(ENABLE_CSP_NEXT);$(ENABLE_PROMISES);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_TRANSFORMS);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_ATTACHMENT_ELEMENT);$(ENABLE_CANVAS_PATH);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPES);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CURSOR_VISIBILITY);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM4_EVENTS_CONSTRUCTOR);$(ENABLE_ES6_MODULES);$(ENABLE_FETCH_API);$(ENABLE_FILE_SYSTEM);$(ENABLE
_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(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_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_ENCRYPTED_MEDIA);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_NAVIGATOR_CONTENT_UTILS);$(ENABLE_READABLE_STREAM_API);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(
ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_WEB_ANIMATIONS);$(ENABLE_WEB_AUDIO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WEBGL);$(ENABLE_WEBVTT_REGIONS);$(ENABLE_WRITABLE_STREAM_API);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ins><span class="cx"> </ClCompile>
</span><span class="cx"> </ItemDefinitionGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="lines">@@ -212,10 +212,6 @@
</span><span class="cx"> <Value>$(ENABLE_DOM4_EVENTS_CONSTRUCTOR)</Value>
</span><span class="cx"> <EnvironmentVariable>true</EnvironmentVariable>
</span><span class="cx"> </BuildMacro>
</span><del>- <BuildMacro Include="ENABLE_ENCRYPTED_MEDIA_V2">
- <Value>$(ENABLE_ENCRYPTED_MEDIA_V2)</Value>
- <EnvironmentVariable>true</EnvironmentVariable>
- </BuildMacro>
</del><span class="cx"> <BuildMacro Include="ENABLE_ES6_MODULES">
</span><span class="cx"> <Value>$(ENABLE_ES6_MODULES)</Value>
</span><span class="cx"> <EnvironmentVariable>true</EnvironmentVariable>
</span><span class="lines">@@ -292,6 +288,10 @@
</span><span class="cx"> <Value>$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES)</Value>
</span><span class="cx"> <EnvironmentVariable>true</EnvironmentVariable>
</span><span class="cx"> </BuildMacro>
</span><ins>+ <BuildMacro Include="ENABLE_LEGACY_ENCRYPTED_MEDIA">
+ <Value>$(ENABLE_LEGACY_ENCRYPTED_MEDIA)</Value>
+ <EnvironmentVariable>true</EnvironmentVariable>
+ </BuildMacro>
</ins><span class="cx"> <BuildMacro Include="ENABLE_LEGACY_NOTIFICATIONS">
</span><span class="cx"> <Value>$(ENABLE_LEGACY_NOTIFICATIONS)</Value>
</span><span class="cx"> <EnvironmentVariable>true</EnvironmentVariable>
</span></span></pre></div>
<a id="trunkSourcecmaketoolsvspropsFeatureDefinesCairoprops"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/tools/vsprops/FeatureDefinesCairo.props (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/tools/vsprops/FeatureDefinesCairo.props 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Source/cmake/tools/vsprops/FeatureDefinesCairo.props 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> <ENABLE_DEVICE_ORIENTATION />
</span><span class="cx"> <ENABLE_DIRECTORY_UPLOAD />
</span><span class="cx"> <ENABLE_DOM4_EVENTS_CONSTRUCTOR>ENABLE_DOM4_EVENTS_CONSTRUCTOR</ENABLE_DOM4_EVENTS_CONSTRUCTOR>
</span><del>- <ENABLE_ENCRYPTED_MEDIA_V2 />
</del><span class="cx"> <ENABLE_ES6_MODULES />
</span><span class="cx"> <ENABLE_FETCH_API />
</span><span class="cx"> <ENABLE_FILE_SYSTEM />
</span><span class="lines">@@ -50,6 +49,7 @@
</span><span class="cx"> <ENABLE_INPUT_TYPE_WEEK />
</span><span class="cx"> <ENABLE_INTL>ENABLE_INTL</ENABLE_INTL>
</span><span class="cx"> <ENABLE_LEGACY_CSS_VENDOR_PREFIXES>ENABLE_LEGACY_CSS_VENDOR_PREFIXES</ENABLE_LEGACY_CSS_VENDOR_PREFIXES>
</span><ins>+ <ENABLE_LEGACY_ENCRYPTED_MEDIA />
</ins><span class="cx"> <ENABLE_LEGACY_NOTIFICATIONS />
</span><span class="cx"> <ENABLE_LINK_PREFETCH />
</span><span class="cx"> <ENABLE_LINK_PRERENDER />
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <ItemDefinitionGroup>
</span><span class="cx"> <ClCompile>
</span><del>- <PreprocessorDefinitions>$(ENABLE_CSP_NEXT);$(ENABLE_PROMISES);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_TRANSFORMS);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_ATTACHMENT_ELEMENT);$(ENABLE_CANVAS_PATH);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPES);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CURSOR_VISIBILITY);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM4_EVENTS_CONSTRUCTOR);$(ENABLE_ENCRYPTED_MEDIA_V2);$(ENABLE_ES6_MODULES);$(ENABLE_FETCH_API);
$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(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_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_NAVIGATOR_CONTENT_UTILS);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO)
;$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_WEB_ANIMATIONS);$(ENABLE_WEB_AUDIO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WEBGL);$(ENABLE_WEBVTT_REGIONS);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
</del><ins>+ <PreprocessorDefinitions>$(ENABLE_CSP_NEXT);$(ENABLE_PROMISES);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_TRANSFORMS);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_ATTACHMENT_ELEMENT);$(ENABLE_CANVAS_PATH);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPES);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CURSOR_VISIBILITY);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM4_EVENTS_CONSTRUCTOR);$(ENABLE_ES6_MODULES);$(ENABLE_FETCH_API);$(ENABLE_FILE_SYSTEM);$(ENABLE
_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(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_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_ENCRYPTED_MEDIA);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_NAVIGATOR_CONTENT_UTILS);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VID
EO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_WEB_ANIMATIONS);$(ENABLE_WEB_AUDIO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WEBGL);$(ENABLE_WEBVTT_REGIONS);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ins><span class="cx"> </ClCompile>
</span><span class="cx"> </ItemDefinitionGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="lines">@@ -210,8 +210,8 @@
</span><span class="cx"> <Value>$(ENABLE_DOM4_EVENTS_CONSTRUCTOR)</Value>
</span><span class="cx"> <EnvironmentVariable>true</EnvironmentVariable>
</span><span class="cx"> </BuildMacro>
</span><del>- <BuildMacro Include="ENABLE_ENCRYPTED_MEDIA_V2">
- <Value>$(ENABLE_ENCRYPTED_MEDIA_V2)</Value>
</del><ins>+ <BuildMacro Include="ENABLE_LEGACY_ENCRYPTED_MEDIA">
+ <Value>$(ENABLE_LEGACY_ENCRYPTED_MEDIA)</Value>
</ins><span class="cx"> <EnvironmentVariable>true</EnvironmentVariable>
</span><span class="cx"> </BuildMacro>
</span><span class="cx"> <BuildMacro Include="ENABLE_ES6_MODULES">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Tools/ChangeLog 2016-10-05 16:02:35 UTC (rev 206811)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-10-05 Zan Dobersek <zdobersek@igalia.com>
+
+ Rename ENABLE_ENCRYPTED_MEDIA_V2 to ENABLE_LEGACY_ENCRYPTED_MEDIA
+ https://bugs.webkit.org/show_bug.cgi?id=162903
+
+ Reviewed by Alex Christensen.
+
+ Rename build guards for the remaining implementation of the legacy EME API
+ to ENABLE_LEGACY_ENCRYPTED_MEDIA. This will allow for the future implementation
+ of the near-finished API to be guarded with the simple ENABLE_ENCRYPTED_MEDIA guards.
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig: Also remove the
+ ENABLE_IOS_TEXT_AUTOSIZING feature define that was renamed in r206395 and was
+ throwing up style checker errors.
+
</ins><span class="cx"> 2016-10-04 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Crash in WebResourceLoaderQuickLookDelegate when the client cancels the navigation to a QuickLook resource
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (206810 => 206811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2016-10-05 14:26:40 UTC (rev 206810)
+++ trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2016-10-05 16:02:35 UTC (rev 206811)
</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_V2[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA_V2;
</del><span class="cx"> ENABLE_FETCH_API = ENABLE_FETCH_API;
</span><span class="cx"> ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
</span><span class="cx"> ENABLE_FONT_LOAD_EVENTS = ;
</span><span class="lines">@@ -124,6 +123,7 @@
</span><span class="cx"> ENABLE_IOS_TOUCH_EVENTS_ios_WITH_INTERNAL_SDK_YES = ENABLE_IOS_TOUCH_EVENTS;
</span><span class="cx">
</span><span class="cx"> ENABLE_LEGACY_CSS_VENDOR_PREFIXES = ENABLE_LEGACY_CSS_VENDOR_PREFIXES;
</span><ins>+ENABLE_LEGACY_ENCRYPTED_MEDIA[sdk=macosx*] = ENABLE_LEGACY_ENCRYPTED_MEDIA;
</ins><span class="cx"> ENABLE_LEGACY_NOTIFICATIONS[sdk=macosx*] = ENABLE_LEGACY_NOTIFICATIONS;
</span><span class="cx"> ENABLE_LEGACY_VENDOR_PREFIXES = ENABLE_LEGACY_VENDOR_PREFIXES;
</span><span class="cx"> ENABLE_LETTERPRESS[sdk=iphone*] = ENABLE_LETTERPRESS;
</span><span class="lines">@@ -200,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_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_SCR
IPT) $(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_REPL
AY) $(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_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_ENCRYPTED_MEDIA) $(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);
</ins></span></pre>
</div>
</div>
</body>
</html>