Title: [198673] trunk/Source
- Revision
- 198673
- Author
- [email protected]
- Date
- 2016-03-25 10:24:33 -0700 (Fri, 25 Mar 2016)
Log Message
Add a compile time flag for using QTKit
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:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (198672 => 198673)
--- trunk/Source/WTF/ChangeLog 2016-03-25 17:12:08 UTC (rev 198672)
+++ trunk/Source/WTF/ChangeLog 2016-03-25 17:24:33 UTC (rev 198673)
@@ -1,3 +1,12 @@
+2016-03-25 Alex Christensen <[email protected]>
+
+ 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 <[email protected]>
Fix iOS9 performance regression after r197572
Modified: trunk/Source/WTF/wtf/Platform.h (198672 => 198673)
--- trunk/Source/WTF/wtf/Platform.h 2016-03-25 17:12:08 UTC (rev 198672)
+++ trunk/Source/WTF/wtf/Platform.h 2016-03-25 17:24:33 UTC (rev 198673)
@@ -531,6 +531,12 @@
#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
Modified: trunk/Source/WebCore/ChangeLog (198672 => 198673)
--- trunk/Source/WebCore/ChangeLog 2016-03-25 17:12:08 UTC (rev 198672)
+++ trunk/Source/WebCore/ChangeLog 2016-03-25 17:24:33 UTC (rev 198673)
@@ -1,3 +1,17 @@
+2016-03-25 Alex Christensen <[email protected]>
+
+ 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 <[email protected]>
[Win] Improve CMake build performance
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (198672 => 198673)
--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2016-03-25 17:12:08 UTC (rev 198672)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2016-03-25 17:24:33 UTC (rev 198673)
@@ -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 @@
}
#endif // USE(AVFOUNDATION)
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) && USE(QTKIT)
if (Settings::isQTKitEnabled())
MediaPlayerPrivateQTKit::registerMediaEngine(addMediaEngine);
#endif
Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm (198672 => 198673)
--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2016-03-25 17:12:08 UTC (rev 198672)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2016-03-25 17:24:33 UTC (rev 198673)
@@ -25,7 +25,7 @@
#import "config.h"
-#if ENABLE(VIDEO)
+#if ENABLE(VIDEO) && USE(QTKIT)
#import "MediaPlayerPrivateQTKit.h"
Modified: trunk/Source/WebCore/platform/graphics/mac/MediaTimeQTKit.h (198672 => 198673)
--- trunk/Source/WebCore/platform/graphics/mac/MediaTimeQTKit.h 2016-03-25 17:12:08 UTC (rev 198672)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaTimeQTKit.h 2016-03-25 17:24:33 UTC (rev 198673)
@@ -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>
Modified: trunk/Source/WebCore/platform/graphics/mac/MediaTimeQTKit.mm (198672 => 198673)
--- trunk/Source/WebCore/platform/graphics/mac/MediaTimeQTKit.mm 2016-03-25 17:12:08 UTC (rev 198672)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaTimeQTKit.mm 2016-03-25 17:24:33 UTC (rev 198673)
@@ -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>
Modified: trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.mm (198672 => 198673)
--- trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.mm 2016-03-25 17:12:08 UTC (rev 198672)
+++ trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.mm 2016-03-25 17:24:33 UTC (rev 198673)
@@ -25,7 +25,7 @@
#import "config.h"
-#if ENABLE(VIDEO)
+#if ENABLE(VIDEO) && USE(QTKIT)
#import "WebVideoFullscreenController.h"
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
