[Qt] DefaultFullScreenVideoHandler and PlatformVideoWindow are included in the build...
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 6 Sep 2013 05:47:21 +0000 (05:47 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 6 Sep 2013 05:47:21 +0000 (05:47 +0000)
https://bugs.webkit.org/show_bug.cgi?id=117206

Patch by Brendan Long <b.long@cablelabs.com> 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.

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

ChangeLog
Source/WebCore/ChangeLog
Source/WebCore/Target.pri
Source/widgetsapi.pri

index 445151e..04d4dc1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2013-09-05  Brendan Long  <b.long@cablelabs.com>
+
+        [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  <ryuan.choi@samsung.com>
 
         [CMAKE] Add c++0x into CXX_FLAGS as a default
index 0c3945d..f1918f8 100644 (file)
@@ -1,3 +1,14 @@
+2013-09-05  Brendan Long  <b.long@cablelabs.com>
+
+        [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  <akling@apple.com>
 
         FrameView: Constructor should take Frame&.
index 4eed4c1..2d61766 100644 (file)
@@ -3326,8 +3326,6 @@ enable?(VIDEO) {
             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 @@ enable?(VIDEO) {
             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 @@ enable?(VIDEO) {
                 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 += \
index 112d237..caed98d 100644 (file)
@@ -110,7 +110,6 @@ SOURCES += \
     $$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 @@ HEADERS += \
     $$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 @@ enable?(VIDEO) {
     }
 }
 
+use?(QT_MULTIMEDIA) {
+    SOURCES += $$PWD/WebKit/qt/WidgetSupport/DefaultFullScreenVideoHandler.cpp
+    HEADERS += $$PWD/WebKit/qt/WidgetSupport/DefaultFullScreenVideoHandler.h
+}