Title: [198677] trunk/Source/WebCore
- Revision
- 198677
- Author
- [email protected]
- Date
- 2016-03-25 11:14:14 -0700 (Fri, 25 Mar 2016)
Log Message
Revert most of r198673.
* 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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (198676 => 198677)
--- trunk/Source/WebCore/ChangeLog 2016-03-25 18:07:35 UTC (rev 198676)
+++ trunk/Source/WebCore/ChangeLog 2016-03-25 18:14:14 UTC (rev 198677)
@@ -1,5 +1,16 @@
2016-03-25 Alex Christensen <[email protected]>
+ Revert most of r198673.
+
+ * 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 Alex Christensen <[email protected]>
+
Add a compile time flag for using QTKit
https://bugs.webkit.org/show_bug.cgi?id=155868
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (198676 => 198677)
--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2016-03-25 18:07:35 UTC (rev 198676)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2016-03-25 18:14:14 UTC (rev 198677)
@@ -65,9 +65,7 @@
#endif
#if PLATFORM(COCOA)
-#if USE(QTKIT)
#include "MediaPlayerPrivateQTKit.h"
-#endif
#if USE(AVFOUNDATION)
#include "MediaPlayerPrivateAVFoundationObjC.h"
@@ -209,7 +207,7 @@
}
#endif // USE(AVFOUNDATION)
-#if PLATFORM(MAC) && USE(QTKIT)
+#if PLATFORM(MAC)
if (Settings::isQTKitEnabled())
MediaPlayerPrivateQTKit::registerMediaEngine(addMediaEngine);
#endif
Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm (198676 => 198677)
--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2016-03-25 18:07:35 UTC (rev 198676)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2016-03-25 18:14:14 UTC (rev 198677)
@@ -25,7 +25,7 @@
#import "config.h"
-#if ENABLE(VIDEO) && USE(QTKIT)
+#if ENABLE(VIDEO)
#import "MediaPlayerPrivateQTKit.h"
Modified: trunk/Source/WebCore/platform/graphics/mac/MediaTimeQTKit.h (198676 => 198677)
--- trunk/Source/WebCore/platform/graphics/mac/MediaTimeQTKit.h 2016-03-25 18:07:35 UTC (rev 198676)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaTimeQTKit.h 2016-03-25 18:14:14 UTC (rev 198677)
@@ -26,7 +26,7 @@
#ifndef MediaTimeQTKit_h
#define MediaTimeQTKit_h
-#if PLATFORM(MAC) && USE(QTKIT)
+#if PLATFORM(MAC)
#include <QTKit/QTTime.h>
#include <wtf/MediaTime.h>
Modified: trunk/Source/WebCore/platform/graphics/mac/MediaTimeQTKit.mm (198676 => 198677)
--- trunk/Source/WebCore/platform/graphics/mac/MediaTimeQTKit.mm 2016-03-25 18:07:35 UTC (rev 198676)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaTimeQTKit.mm 2016-03-25 18:14:14 UTC (rev 198677)
@@ -26,7 +26,7 @@
#include "config.h"
#include "MediaTimeQTKit.h"
-#if PLATFORM(MAC) && USE(QTKIT)
+#if PLATFORM(MAC)
#import "SoftLinking.h"
#import <QTKit/QTTime.h>
Modified: trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.mm (198676 => 198677)
--- trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.mm 2016-03-25 18:07:35 UTC (rev 198676)
+++ trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.mm 2016-03-25 18:14:14 UTC (rev 198677)
@@ -25,7 +25,7 @@
#import "config.h"
-#if ENABLE(VIDEO) && USE(QTKIT)
+#if ENABLE(VIDEO)
#import "WebVideoFullscreenController.h"
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
