Title: [169386] trunk/Source/WebCore
- Revision
- 169386
- Author
- [email protected]
- Date
- 2014-05-27 09:45:09 -0700 (Tue, 27 May 2014)
Log Message
Fix Mavericks bots from r169383.
https://bugs.webkit.org/show_bug.cgi?id=133311
Reviewed by Eric Carlson.
* platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h: Update #ifdef to check for ENABLE(MEDIA_SOURCE).
* platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm: Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (169385 => 169386)
--- trunk/Source/WebCore/ChangeLog 2014-05-27 16:36:09 UTC (rev 169385)
+++ trunk/Source/WebCore/ChangeLog 2014-05-27 16:45:09 UTC (rev 169386)
@@ -1,3 +1,13 @@
+2014-05-27 Jon Lee <[email protected]>
+
+ Fix Mavericks bots from r169383.
+ https://bugs.webkit.org/show_bug.cgi?id=133311
+
+ Reviewed by Eric Carlson.
+
+ * platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h: Update #ifdef to check for ENABLE(MEDIA_SOURCE).
+ * platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm: Ditto.
+
2014-05-27 Radu Stavila <[email protected]>
REGRESSION (r168046): Incorrect handling of multicol spanner
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h (169385 => 169386)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h 2014-05-27 16:36:09 UTC (rev 169385)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h 2014-05-27 16:45:09 UTC (rev 169386)
@@ -30,7 +30,7 @@
#include <wtf/PassOwnPtr.h>
#include <wtf/RetainPtr.h>
-#if ENABLE(ENCRYPTED_MEDIA_V2) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#if ENABLE(ENCRYPTED_MEDIA_V2) && ENABLE(MEDIA_SOURCE)
namespace WebCore {
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm (169385 => 169386)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm 2014-05-27 16:36:09 UTC (rev 169385)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm 2014-05-27 16:45:09 UTC (rev 169386)
@@ -26,7 +26,7 @@
#import "config.h"
#import "CDMSessionMediaSourceAVFObjC.h"
-#if ENABLE(ENCRYPTED_MEDIA_V2) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#if ENABLE(ENCRYPTED_MEDIA_V2) && ENABLE(MEDIA_SOURCE)
#import "CDM.h"
#import "CDMSession.h"
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
