<!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>[164943] 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/164943">164943</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-02 09:55:29 -0800 (Sun, 02 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Support ENABLE_ENCRYPTED_MEDIA in cmake builds
https://bugs.webkit.org/show_bug.cgi?id=129575
Patch by Dirkjan Ochtman <d.ochtman@activevideo.com> on 2014-03-02
Reviewed by Philippe Normand.
.:
* Source/cmake/OptionsEfl.cmake:
Enabled ENABLE_ENCRYPTED_MEDIA{,_V2} usage.
* Source/cmake/OptionsGTK.cmake:
Enabled ENABLE_ENCRYPTED_MEDIA{,_V2} usage.
* Source/cmake/WebKitFeatures.cmake:
Enabled ENABLE_ENCRYPTED_MEDIA{,_V2} usage.
* Source/cmakeconfig.h.cmake:
Added ENABLE_ENCRYPTED_MEDIA{,_V2} flags.
Source/WebCore:
No new tests, only fixes the build.
* CMakeLists.txt:
Add support for ENABLE_ENCRYPTED_MEDIA.
* Modules/encryptedmedia/MediaKeySession.cpp:
(WebCore::MediaKeySession::close):
Assign nullptr instead of 0 to OwnPtr to appease gcc-4.7.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</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="#trunkSourceWebCoreModulesencryptedmediaMediaKeySessioncpp">trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp</a></li>
<li><a href="#trunkSourcecmakeOptionsEflcmake">trunk/Source/cmake/OptionsEfl.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsGTKcmake">trunk/Source/cmake/OptionsGTK.cmake</a></li>
<li><a href="#trunkSourcecmakeWebKitFeaturescmake">trunk/Source/cmake/WebKitFeatures.cmake</a></li>
<li><a href="#trunkSourcecmakeconfighcmake">trunk/Source/cmakeconfig.h.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (164942 => 164943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-03-02 17:19:59 UTC (rev 164942)
+++ trunk/ChangeLog 2014-03-02 17:55:29 UTC (rev 164943)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-03-02 Dirkjan Ochtman <d.ochtman@activevideo.com>
+
+ Support ENABLE_ENCRYPTED_MEDIA in cmake builds
+ https://bugs.webkit.org/show_bug.cgi?id=129575
+
+ Reviewed by Philippe Normand.
+
+ * Source/cmake/OptionsEfl.cmake:
+ Enabled ENABLE_ENCRYPTED_MEDIA{,_V2} usage.
+ * Source/cmake/OptionsGTK.cmake:
+ Enabled ENABLE_ENCRYPTED_MEDIA{,_V2} usage.
+ * Source/cmake/WebKitFeatures.cmake:
+ Enabled ENABLE_ENCRYPTED_MEDIA{,_V2} usage.
+ * Source/cmakeconfig.h.cmake:
+ Added ENABLE_ENCRYPTED_MEDIA{,_V2} flags.
+
</ins><span class="cx"> 2014-02-27 Peter Molnar <pmolnar.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> Enable support of X-Content-Type-Options: nosniff header for EFL
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (164942 => 164943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2014-03-02 17:19:59 UTC (rev 164942)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-03-02 17:55:29 UTC (rev 164943)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> set(WebCore_INCLUDE_DIRECTORIES
</span><span class="cx"> "${WEBCORE_DIR}"
</span><span class="cx"> "${WEBCORE_DIR}/Modules/battery"
</span><ins>+ "${WEBCORE_DIR}/Modules/encryptedmedia"
</ins><span class="cx"> "${WEBCORE_DIR}/Modules/gamepad"
</span><span class="cx"> "${WEBCORE_DIR}/Modules/geolocation"
</span><span class="cx"> "${WEBCORE_DIR}/Modules/indexeddb"
</span><span class="lines">@@ -124,6 +125,7 @@
</span><span class="cx">
</span><span class="cx"> set(WebCore_IDL_INCLUDES
</span><span class="cx"> Modules/battery
</span><ins>+ Modules/encryptedmedia
</ins><span class="cx"> Modules/gamepad
</span><span class="cx"> Modules/geolocation
</span><span class="cx"> Modules/indexeddb
</span><span class="lines">@@ -2568,6 +2570,25 @@
</span><span class="cx"> WTF
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+if (ENABLE_ENCRYPTED_MEDIA OR ENABLE_ENCRYPTED_MEDIA_V2)
+ list(APPEND WebCore_SOURCES
+ Modules/encryptedmedia/CDM.cpp
+ Modules/encryptedmedia/MediaKeyMessageEvent.cpp
+ Modules/encryptedmedia/MediaKeyNeededEvent.cpp
+ Modules/encryptedmedia/MediaKeys.cpp
+ Modules/encryptedmedia/MediaKeySession.cpp
+ html/MediaKeyEvent.cpp
+ )
+ list(APPEND WebCore_IDL_FILES
+ Modules/encryptedmedia/MediaKeyMessageEvent.idl
+ Modules/encryptedmedia/MediaKeyNeededEvent.idl
+ Modules/encryptedmedia/MediaKeySession.idl
+ Modules/encryptedmedia/MediaKeys.idl
+ html/MediaKeyEvent.idl
+ html/MediaKeyError.idl
+ )
+endif ()
+
</ins><span class="cx"> if (ENABLE_SQL_DATABASE)
</span><span class="cx"> list(APPEND WebCore_SOURCES
</span><span class="cx"> Modules/webdatabase/WorkerGlobalScopeWebDatabase.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164942 => 164943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-02 17:19:59 UTC (rev 164942)
+++ trunk/Source/WebCore/ChangeLog 2014-03-02 17:55:29 UTC (rev 164943)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-03-02 Dirkjan Ochtman <d.ochtman@activevideo.com>
+
+ Support ENABLE_ENCRYPTED_MEDIA in cmake builds
+ https://bugs.webkit.org/show_bug.cgi?id=129575
+
+ Reviewed by Philippe Normand.
+
+ No new tests, only fixes the build.
+
+ * CMakeLists.txt:
+ Add support for ENABLE_ENCRYPTED_MEDIA.
+ * Modules/encryptedmedia/MediaKeySession.cpp:
+ (WebCore::MediaKeySession::close):
+ Assign nullptr instead of 0 to OwnPtr to appease gcc-4.7.
+
</ins><span class="cx"> 2014-03-01 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> WebKit2 View Gestures (Smart Magnification): Support for iOS
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaMediaKeySessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp (164942 => 164943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp 2014-03-02 17:19:59 UTC (rev 164942)
+++ trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp 2014-03-02 17:55:29 UTC (rev 164943)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_session)
</span><span class="cx"> m_session->releaseKeys();
</span><del>- m_session = 0;
</del><ins>+ m_session = nullptr;
</ins><span class="cx"> m_asyncEventQueue.cancelAllEvents();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsEfl.cmake (164942 => 164943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsEfl.cmake 2014-03-02 17:19:59 UTC (rev 164942)
+++ trunk/Source/cmake/OptionsEfl.cmake 2014-03-02 17:55:29 UTC (rev 164943)
</span><span class="lines">@@ -68,6 +68,8 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOM4_EVENTS_CONSTRUCTOR ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOWNLOAD_ATTRIBUTE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT ON)
</span><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA_V2 OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FAST_MOBILE_SCROLLING ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FILTERS ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FULLSCREEN_API ON)
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (164942 => 164943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2014-03-02 17:19:59 UTC (rev 164942)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-03-02 17:55:29 UTC (rev 164943)
</span><span class="lines">@@ -44,6 +44,8 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATALIST_ELEMENT ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOWNLOAD_ATTRIBUTE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT ON)
</span><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA_V2 OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FAST_MOBILE_SCROLLING ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FILTERS ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FULLSCREEN_API ON)
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitFeaturescmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitFeatures.cmake (164942 => 164943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitFeatures.cmake 2014-03-02 17:19:59 UTC (rev 164942)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2014-03-02 17:55:29 UTC (rev 164943)
</span><span class="lines">@@ -48,6 +48,8 @@
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_DOM4_EVENTS_CONSTRUCTOR "Toggle DOM4 Events constructors" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_DOWNLOAD_ATTRIBUTE "Toggle download attribute support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_DRAG_SUPPORT "Toggle Drag Support" OFF)
</span><ins>+ WEBKIT_OPTION_DEFINE(ENABLE_ENCRYPTED_MEDIA "Toggle EME support" OFF)
+ WEBKIT_OPTION_DEFINE(ENABLE_ENCRYPTED_MEDIA_V2 "Support EME v2" OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_FAST_MOBILE_SCROLLING "Toggle Fast Mobile Scrolling support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_FILTERS "Toggle SVG Filters support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_FONT_LOAD_EVENTS "Toggle Font Load Events support" OFF)
</span></span></pre></div>
<a id="trunkSourcecmakeconfighcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmakeconfig.h.cmake (164942 => 164943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmakeconfig.h.cmake 2014-03-02 17:19:59 UTC (rev 164942)
+++ trunk/Source/cmakeconfig.h.cmake 2014-03-02 17:55:29 UTC (rev 164943)
</span><span class="lines">@@ -38,6 +38,8 @@
</span><span class="cx"> #cmakedefine01 ENABLE_DOM4_EVENTS_CONSTRUCTOR
</span><span class="cx"> #cmakedefine01 ENABLE_DOWNLOAD_ATTRIBUTE
</span><span class="cx"> #cmakedefine01 ENABLE_DRAG_SUPPORT
</span><ins>+#cmakedefine01 ENABLE_ENCRYPTED_MEDIA
+#cmakedefine01 ENABLE_ENCRYPTED_MEDIA_V2
</ins><span class="cx"> #cmakedefine01 ENABLE_EVENT_MODE_METATAGS
</span><span class="cx"> #cmakedefine01 ENABLE_FAST_MOBILE_SCROLLING
</span><span class="cx"> #cmakedefine01 ENABLE_FILTERS
</span></span></pre>
</div>
</div>
</body>
</html>