Bug 110284 - EME: Enable both ENCRYPTED_MEDIA and ENCRYPTED_MEDIA_V2 until clients transition to the new API.
Summary: EME: Enable both ENCRYPTED_MEDIA and ENCRYPTED_MEDIA_V2 until clients transit...
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Jer Noble
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-02-19 17:14 PST by Jer Noble
Modified: 2013-02-25 20:51 PST (History)
1 user (show)

See Also:

Attachments
Patch (6.99 KB, patch)
2013-02-20 11:07 PST, Jer Noble 		eric.carlson: review+
Details | Formatted Diff | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Jer Noble 2013-02-19 17:14:51 PST 
EME: Enable both ENCRYPTED_MEDIA and ENCRYPTED_MEDIA_V2 until clients transition to the new API.
Comment 1 Jer Noble 2013-02-20 11:07:26 PST 
Created attachment 189341 [details]
Patch
Comment 2 Laszlo Gombos 2013-02-20 13:11:44 PST 
I would recommend changing FeatureDefines.h instead (only one change):

Index: FeatureDefines.h
===================================================================
--- FeatureDefines.h	(revision 143483)
+++ FeatureDefines.h	(working copy)
@@ -132,6 +132,12 @@
 #endif
 
 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#if !defined(ENABLE_ENCRYPTED_MEDIA)
+#define ENABLE_ENCRYPTED_MEDIA 1
+#endif
+#endif
+
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
 #if !defined(ENABLE_ENCRYPTED_MEDIA_V2)
 #define ENABLE_ENCRYPTED_MEDIA_V2 1
 #endif

If you change FeatureDefines.xcconfig, you need to change all 4 of them together as it is described in the file:

// The contents of this file must be kept in sync with FeatureDefines.xcconfig in JavaScriptCore,
// WebCore, WebKit and WebKit2.  Also the default values of the ENABLE_FEATURE_NAME macros in
// build-webkit should match the values below, but they do not need to be in the same order.
Comment 3 Jer Noble 2013-02-20 14:51:25 PST 
Committed r143509: <http://trac.webkit.org/changeset/143509>
Comment 4 Laszlo Gombos 2013-02-25 20:51:40 PST 
(In reply to comment #2)
> I would recommend changing FeatureDefines.h instead .......etc..

Fixed in r143984 .