Title: [164943] trunk
- Revision
- 164943
- Author
- [email protected]
- Date
- 2014-03-02 09:55:29 -0800 (Sun, 02 Mar 2014)
Log Message
Support ENABLE_ENCRYPTED_MEDIA in cmake builds
https://bugs.webkit.org/show_bug.cgi?id=129575
Patch by Dirkjan Ochtman <[email protected]> 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.
Modified Paths
Diff
Modified: trunk/ChangeLog (164942 => 164943)
--- trunk/ChangeLog 2014-03-02 17:19:59 UTC (rev 164942)
+++ trunk/ChangeLog 2014-03-02 17:55:29 UTC (rev 164943)
@@ -1,3 +1,19 @@
+2014-03-02 Dirkjan Ochtman <[email protected]>
+
+ 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.
+
2014-02-27 Peter Molnar <[email protected]>
Enable support of X-Content-Type-Options: nosniff header for EFL
Modified: trunk/Source/WebCore/CMakeLists.txt (164942 => 164943)
--- 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)
@@ -1,6 +1,7 @@
set(WebCore_INCLUDE_DIRECTORIES
"${WEBCORE_DIR}"
"${WEBCORE_DIR}/Modules/battery"
+ "${WEBCORE_DIR}/Modules/encryptedmedia"
"${WEBCORE_DIR}/Modules/gamepad"
"${WEBCORE_DIR}/Modules/geolocation"
"${WEBCORE_DIR}/Modules/indexeddb"
@@ -124,6 +125,7 @@
set(WebCore_IDL_INCLUDES
Modules/battery
+ Modules/encryptedmedia
Modules/gamepad
Modules/geolocation
Modules/indexeddb
@@ -2568,6 +2570,25 @@
WTF
)
+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 ()
+
if (ENABLE_SQL_DATABASE)
list(APPEND WebCore_SOURCES
Modules/webdatabase/WorkerGlobalScopeWebDatabase.cpp
Modified: trunk/Source/WebCore/ChangeLog (164942 => 164943)
--- 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)
@@ -1,3 +1,18 @@
+2014-03-02 Dirkjan Ochtman <[email protected]>
+
+ 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.
+
2014-03-01 Tim Horton <[email protected]>
WebKit2 View Gestures (Smart Magnification): Support for iOS
Modified: trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp (164942 => 164943)
--- 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)
@@ -68,7 +68,7 @@
{
if (m_session)
m_session->releaseKeys();
- m_session = 0;
+ m_session = nullptr;
m_asyncEventQueue.cancelAllEvents();
}
Modified: trunk/Source/cmake/OptionsEfl.cmake (164942 => 164943)
--- 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)
@@ -68,6 +68,8 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOM4_EVENTS_CONSTRUCTOR ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOWNLOAD_ATTRIBUTE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA_V2 OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FAST_MOBILE_SCROLLING ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FILTERS ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FULLSCREEN_API ON)
Modified: trunk/Source/cmake/OptionsGTK.cmake (164942 => 164943)
--- 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)
@@ -44,6 +44,8 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATALIST_ELEMENT ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOWNLOAD_ATTRIBUTE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA_V2 OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FAST_MOBILE_SCROLLING ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FILTERS ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FULLSCREEN_API ON)
Modified: trunk/Source/cmake/WebKitFeatures.cmake (164942 => 164943)
--- 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)
@@ -48,6 +48,8 @@
WEBKIT_OPTION_DEFINE(ENABLE_DOM4_EVENTS_CONSTRUCTOR "Toggle DOM4 Events constructors" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_DOWNLOAD_ATTRIBUTE "Toggle download attribute support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_DRAG_SUPPORT "Toggle Drag Support" OFF)
+ WEBKIT_OPTION_DEFINE(ENABLE_ENCRYPTED_MEDIA "Toggle EME support" OFF)
+ WEBKIT_OPTION_DEFINE(ENABLE_ENCRYPTED_MEDIA_V2 "Support EME v2" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_FAST_MOBILE_SCROLLING "Toggle Fast Mobile Scrolling support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_FILTERS "Toggle SVG Filters support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_FONT_LOAD_EVENTS "Toggle Font Load Events support" OFF)
Modified: trunk/Source/cmakeconfig.h.cmake (164942 => 164943)
--- 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)
@@ -38,6 +38,8 @@
#cmakedefine01 ENABLE_DOM4_EVENTS_CONSTRUCTOR
#cmakedefine01 ENABLE_DOWNLOAD_ATTRIBUTE
#cmakedefine01 ENABLE_DRAG_SUPPORT
+#cmakedefine01 ENABLE_ENCRYPTED_MEDIA
+#cmakedefine01 ENABLE_ENCRYPTED_MEDIA_V2
#cmakedefine01 ENABLE_EVENT_MODE_METATAGS
#cmakedefine01 ENABLE_FAST_MOBILE_SCROLLING
#cmakedefine01 ENABLE_FILTERS
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
