Add a compile time flag for using QTKit
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 25 Mar 2016 17:24:33 +0000 (17:24 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 25 Mar 2016 17:24:33 +0000 (17:24 +0000)
https://bugs.webkit.org/show_bug.cgi?id=155868

Reviewed by Dan Bates.

Source/WebCore:

* platform/graphics/MediaPlayer.cpp:
(WebCore::buildMediaEnginesVector):
* platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
* platform/graphics/mac/MediaTimeQTKit.h:
* platform/graphics/mac/MediaTimeQTKit.mm:
* platform/mac/WebVideoFullscreenController.mm:

Source/WTF:

* wtf/Platform.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@198673 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WTF/ChangeLog
Source/WTF/wtf/Platform.h
Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/MediaPlayer.cpp
Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm
Source/WebCore/platform/graphics/mac/MediaTimeQTKit.h
Source/WebCore/platform/graphics/mac/MediaTimeQTKit.mm
Source/WebCore/platform/mac/WebVideoFullscreenController.mm

index d908844..067e728 100644 (file)
@@ -1,3 +1,12 @@
+2016-03-25  Alex Christensen  <achristensen@webkit.org>
+
+        Add a compile time flag for using QTKit
+        https://bugs.webkit.org/show_bug.cgi?id=155868
+
+        Reviewed by Dan Bates.
+
+        * wtf/Platform.h:
+
 2016-03-24  Alex Christensen  <achristensen@webkit.org>
 
         Fix iOS9 performance regression after r197572
index 4efa6a5..dd3dc1d 100644 (file)
 
 #if PLATFORM(MAC)
 
+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
+#define USE_QTKIT 1
+#else
+#define USE_QTKIT 0
+#endif
+
 #define USE_APPKIT 1
 #define HAVE_RUNLOOP_TIMER 1
 #define HAVE_SEC_IDENTITY 1
index e7bb7c1..7af9983 100644 (file)
@@ -1,3 +1,17 @@
+2016-03-25  Alex Christensen  <achristensen@webkit.org>
+
+        Add a compile time flag for using QTKit
+        https://bugs.webkit.org/show_bug.cgi?id=155868
+
+        Reviewed by Dan Bates.
+
+        * platform/graphics/MediaPlayer.cpp:
+        (WebCore::buildMediaEnginesVector):
+        * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
+        * platform/graphics/mac/MediaTimeQTKit.h:
+        * platform/graphics/mac/MediaTimeQTKit.mm:
+        * platform/mac/WebVideoFullscreenController.mm:
+
 2016-03-25  Brent Fulgham  <bfulgham@apple.com>
 
         [Win] Improve CMake build performance 
index 90695b4..cceff77 100644 (file)
@@ -65,7 +65,9 @@
 #endif
 
 #if PLATFORM(COCOA)
+#if USE(QTKIT)
 #include "MediaPlayerPrivateQTKit.h"
+#endif
 
 #if USE(AVFOUNDATION)
 #include "MediaPlayerPrivateAVFoundationObjC.h"
@@ -207,7 +209,7 @@ static void buildMediaEnginesVector()
     }
 #endif // USE(AVFOUNDATION)
 
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) && USE(QTKIT)
     if (Settings::isQTKitEnabled())
         MediaPlayerPrivateQTKit::registerMediaEngine(addMediaEngine);
 #endif
index b270318..829b6ee 100644 (file)
@@ -25,7 +25,7 @@
 
 #import "config.h"
 
-#if ENABLE(VIDEO)
+#if ENABLE(VIDEO) && USE(QTKIT)
 
 #import "MediaPlayerPrivateQTKit.h"
 
index ada8ebd..527c1fb 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef MediaTimeQTKit_h
 #define MediaTimeQTKit_h
 
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) && USE(QTKIT)
 
 #include <QTKit/QTTime.h>
 #include <wtf/MediaTime.h>
index 79e272b..34f01fd 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "MediaTimeQTKit.h"
 
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) && USE(QTKIT)
 
 #import "SoftLinking.h"
 #import <QTKit/QTTime.h>
index 4e5c5fc..dd2b7f3 100644 (file)
@@ -25,7 +25,7 @@
 
 #import "config.h"
 
-#if ENABLE(VIDEO)
+#if ENABLE(VIDEO) && USE(QTKIT)
 
 #import "WebVideoFullscreenController.h"