Title: [155175] trunk
- Revision
- 155175
- Author
- [email protected]
- Date
- 2013-09-05 22:47:21 -0700 (Thu, 05 Sep 2013)
Log Message
[Qt] DefaultFullScreenVideoHandler and PlatformVideoWindow are included in the build when they are disabled
https://bugs.webkit.org/show_bug.cgi?id=117206
Patch by Brendan Long <[email protected]> on 2013-09-05
Reviewed by Philippe Normand.
.:
* Source/widgetsapi.pri: Don't include DefaultFullScreenVideoHandler when it's disabled.
Source/WebCore:
No new tests because this just fixes a build warning.
* Target.pri: Don't include PlatformVideoWindow* files in the build when they are disabled.
Modified Paths
Diff
Modified: trunk/ChangeLog (155174 => 155175)
--- trunk/ChangeLog 2013-09-06 04:49:52 UTC (rev 155174)
+++ trunk/ChangeLog 2013-09-06 05:47:21 UTC (rev 155175)
@@ -1,3 +1,12 @@
+2013-09-05 Brendan Long <[email protected]>
+
+ [Qt] DefaultFullScreenVideoHandler and PlatformVideoWindow are included in the build when they are disabled
+ https://bugs.webkit.org/show_bug.cgi?id=117206
+
+ Reviewed by Philippe Normand.
+
+ * Source/widgetsapi.pri: Don't include DefaultFullScreenVideoHandler when it's disabled.
+
2013-09-05 Ryuan Choi <[email protected]>
[CMAKE] Add c++0x into CXX_FLAGS as a default
Modified: trunk/Source/WebCore/ChangeLog (155174 => 155175)
--- trunk/Source/WebCore/ChangeLog 2013-09-06 04:49:52 UTC (rev 155174)
+++ trunk/Source/WebCore/ChangeLog 2013-09-06 05:47:21 UTC (rev 155175)
@@ -1,3 +1,14 @@
+2013-09-05 Brendan Long <[email protected]>
+
+ [Qt] DefaultFullScreenVideoHandler and PlatformVideoWindow are included in the build when they are disabled
+ https://bugs.webkit.org/show_bug.cgi?id=117206
+
+ Reviewed by Philippe Normand.
+
+ No new tests because this just fixes a build warning.
+
+ * Target.pri: Don't include PlatformVideoWindow* files in the build when they are disabled.
+
2013-09-05 Andreas Kling <[email protected]>
FrameView: Constructor should take Frame&.
Modified: trunk/Source/WebCore/Target.pri (155174 => 155175)
--- trunk/Source/WebCore/Target.pri 2013-09-06 04:49:52 UTC (rev 155174)
+++ trunk/Source/WebCore/Target.pri 2013-09-06 05:47:21 UTC (rev 155175)
@@ -3326,8 +3326,6 @@
platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h \
platform/graphics/gstreamer/VideoSinkGStreamer.h \
platform/graphics/gstreamer/WebKitWebSourceGStreamer.h \
- platform/graphics/gstreamer/PlatformVideoWindow.h \
- platform/graphics/gstreamer/PlatformVideoWindowPrivate.h \
platform/graphics/gstreamer/ImageGStreamer.h
SOURCES += \
platform/graphics/gstreamer/GStreamerGWorld.cpp \
@@ -3335,7 +3333,6 @@
platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp \
platform/graphics/gstreamer/VideoSinkGStreamer.cpp \
platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp \
- platform/graphics/gstreamer/PlatformVideoWindowQt.cpp \
platform/graphics/gstreamer/ImageGStreamerQt.cpp
enable?(VIDEO_TRACK) {
HEADERS += \
@@ -3347,6 +3344,13 @@
platform/graphics/gstreamer/TextCombinerGStreamer.cpp \
platform/graphics/gstreamer/TextSinkGStreamer.cpp
}
+ use?(NATIVE_FULLSCREEN_VIDEO) {
+ HEADERS += \
+ platform/graphics/gstreamer/PlatformVideoWindow.h \
+ platform/graphics/gstreamer/PlatformVideoWindowPrivate.h
+ SOURCES += \
+ platform/graphics/gstreamer/PlatformVideoWindowQt.cpp
+ }
} else:use?(QT_MULTIMEDIA) {
HEADERS += \
Modified: trunk/Source/widgetsapi.pri (155174 => 155175)
--- trunk/Source/widgetsapi.pri 2013-09-06 04:49:52 UTC (rev 155174)
+++ trunk/Source/widgetsapi.pri 2013-09-06 05:47:21 UTC (rev 155175)
@@ -110,7 +110,6 @@
$$PWD/WebKit/qt/WidgetSupport/QtFallbackWebPopup.cpp \
$$PWD/WebKit/qt/WidgetSupport/QtWebComboBox.cpp \
$$PWD/WebKit/qt/WidgetSupport/QWebUndoCommand.cpp \
- $$PWD/WebKit/qt/WidgetSupport/DefaultFullScreenVideoHandler.cpp \
$$PWD/WebKit/qt/WidgetSupport/InitWebKitQt.cpp \
$$PWD/WebKit/qt/WidgetSupport/InspectorClientWebPage.cpp \
$$PWD/WebKit/qt/WidgetSupport/PageClientQt.cpp \
@@ -130,7 +129,6 @@
$$PWD/WebKit/qt/Api/qwebkitplatformplugin.h \
$$PWD/WebKit/qt/WidgetSupport/InitWebKitQt.h \
$$PWD/WebKit/qt/WidgetSupport/InspectorClientWebPage.h \
- $$PWD/WebKit/qt/WidgetSupport/DefaultFullScreenVideoHandler.h \
$$PWD/WebKit/qt/WidgetSupport/QtFallbackWebPopup.h \
$$PWD/WebKit/qt/WidgetSupport/QtWebComboBox.h \
$$PWD/WebKit/qt/WidgetSupport/QWebUndoCommand.h \
@@ -155,3 +153,7 @@
}
}
+use?(QT_MULTIMEDIA) {
+ SOURCES += $$PWD/WebKit/qt/WidgetSupport/DefaultFullScreenVideoHandler.cpp
+ HEADERS += $$PWD/WebKit/qt/WidgetSupport/DefaultFullScreenVideoHandler.h
+}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
