[webkit-changes] [94155] trunk/Source/WebCore

Wed, 31 Aug 2011 00:01:13 -0700

Title: [94155] trunk/Source/WebCore
Revision
94155
Author
ph...@webkit.org
Date
2011-08-31 00:02:12 -0700 (Wed, 31 Aug 2011)

Log Message

        [GTK] gstreamer/ files directly related to the MediaPlayer need VIDEO guards
        https://bugs.webkit.org/show_bug.cgi?id=67196

        Reviewed by Martin Robinson.

        Guard those files with ENABLE(VIDEO) so other features using
        GStreamer can be built even with VIDEO disabled.

        * platform/graphics/gstreamer/GStreamerGWorld.cpp:
        * platform/graphics/gstreamer/GStreamerGWorld.h:
        * platform/graphics/gstreamer/ImageGStreamer.h:
        * platform/graphics/gstreamer/ImageGStreamerCG.mm:
        * platform/graphics/gstreamer/ImageGStreamerCairo.cpp:
        * platform/graphics/gstreamer/ImageGStreamerQt.cpp:
        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
        * platform/graphics/gstreamer/PlatformVideoWindow.h:
        * platform/graphics/gstreamer/PlatformVideoWindowGtk.cpp:
        * platform/graphics/gstreamer/VideoSinkGStreamer.cpp:
        * platform/graphics/gstreamer/VideoSinkGStreamer.h:
        * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
        * platform/graphics/gstreamer/WebKitWebSourceGStreamer.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (94154 => 94155)


--- trunk/Source/WebCore/ChangeLog	2011-08-31 06:59:54 UTC (rev 94154)
+++ trunk/Source/WebCore/ChangeLog	2011-08-31 07:02:12 UTC (rev 94155)
@@ -1,3 +1,28 @@
+2011-08-30  Philippe Normand  <pnorm...@igalia.com>
+
+        [GTK] gstreamer/ files directly related to the MediaPlayer need VIDEO guards
+        https://bugs.webkit.org/show_bug.cgi?id=67196
+
+        Reviewed by Martin Robinson.
+
+        Guard those files with ENABLE(VIDEO) so other features using
+        GStreamer can be built even with VIDEO disabled.
+
+        * platform/graphics/gstreamer/GStreamerGWorld.cpp:
+        * platform/graphics/gstreamer/GStreamerGWorld.h:
+        * platform/graphics/gstreamer/ImageGStreamer.h:
+        * platform/graphics/gstreamer/ImageGStreamerCG.mm:
+        * platform/graphics/gstreamer/ImageGStreamerCairo.cpp:
+        * platform/graphics/gstreamer/ImageGStreamerQt.cpp:
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
+        * platform/graphics/gstreamer/PlatformVideoWindow.h:
+        * platform/graphics/gstreamer/PlatformVideoWindowGtk.cpp:
+        * platform/graphics/gstreamer/VideoSinkGStreamer.cpp:
+        * platform/graphics/gstreamer/VideoSinkGStreamer.h:
+        * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+        * platform/graphics/gstreamer/WebKitWebSourceGStreamer.h:
+
 2011-08-30  Sheriff Bot  <webkit.review....@gmail.com>
 
         Unreviewed, rolling out r94142, r94144, r94145, and r94148.

Modified: trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerGWorld.cpp (94154 => 94155)


--- trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerGWorld.cpp	2011-08-31 06:59:54 UTC (rev 94154)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerGWorld.cpp	2011-08-31 07:02:12 UTC (rev 94155)
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "GStreamerGWorld.h"
-#if USE(GSTREAMER)
+#if ENABLE(VIDEO) && USE(GSTREAMER)
 
 #include "GOwnPtrGStreamer.h"
 #include <gst/gst.h>

Modified: trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerGWorld.h (94154 => 94155)


--- trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerGWorld.h	2011-08-31 06:59:54 UTC (rev 94154)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerGWorld.h	2011-08-31 07:02:12 UTC (rev 94155)
@@ -20,7 +20,7 @@
 
 #ifndef GStreamerGWorld_h
 #define GStreamerGWorld_h
-#if USE(GSTREAMER)
+#if ENABLE(VIDEO) && USE(GSTREAMER)
 
 #include "PlatformVideoWindow.h"
 #include "RefCounted.h"

Modified: trunk/Source/WebCore/platform/graphics/gstreamer/ImageGStreamer.h (94154 => 94155)


--- trunk/Source/WebCore/platform/graphics/gstreamer/ImageGStreamer.h	2011-08-31 06:59:54 UTC (rev 94154)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/ImageGStreamer.h	2011-08-31 07:02:12 UTC (rev 94155)
@@ -20,7 +20,7 @@
 #ifndef ImageGStreamer_h
 #define ImageGStreamer_h
 
-#if USE(GSTREAMER)
+#if ENABLE(VIDEO) && USE(GSTREAMER)
 
 #include "BitmapImage.h"
 #include <gst/gst.h>

Modified: trunk/Source/WebCore/platform/graphics/gstreamer/ImageGStreamerCG.mm (94154 => 94155)


--- trunk/Source/WebCore/platform/graphics/gstreamer/ImageGStreamerCG.mm	2011-08-31 06:59:54 UTC (rev 94154)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/ImageGStreamerCG.mm	2011-08-31 07:02:12 UTC (rev 94155)
@@ -21,7 +21,7 @@
 
 #include "GraphicsContextCG.h"
 #include "ImageGStreamer.h"
-#if USE(GSTREAMER)
+#if ENABLE(VIDEO) && USE(GSTREAMER)
 
 using namespace WebCore;

Modified: trunk/Source/WebCore/platform/graphics/gstreamer/ImageGStreamerCairo.cpp (94154 => 94155)


--- trunk/Source/WebCore/platform/graphics/gstreamer/ImageGStreamerCairo.cpp	2011-08-31 06:59:54 UTC (rev 94154)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/ImageGStreamerCairo.cpp	2011-08-31 07:02:12 UTC (rev 94155)
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "ImageGStreamer.h"
 
-#if USE(GSTREAMER)
+#if ENABLE(VIDEO) && USE(GSTREAMER)
 
 #include "GOwnPtr.h"

Modified: trunk/Source/WebCore/platform/graphics/gstreamer/ImageGStreamerQt.cpp (94154 => 94155)


--- trunk/Source/WebCore/platform/graphics/gstreamer/ImageGStreamerQt.cpp	2011-08-31 06:59:54 UTC (rev 94154)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/ImageGStreamerQt.cpp	2011-08-31 07:02:12 UTC (rev 94155)
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "ImageGStreamer.h"
 
-#if USE(GSTREAMER)
+#if ENABLE(VIDEO) && USE(GSTREAMER)
 #include "GOwnPtr.h"
 
 using namespace std;

Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (94154 => 94155)


--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp	2011-08-31 06:59:54 UTC (rev 94154)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp	2011-08-31 07:02:12 UTC (rev 94155)
@@ -24,7 +24,7 @@
 #include "config.h"
 #include "MediaPlayerPrivateGStreamer.h"
 
-#if USE(GSTREAMER)
+#if ENABLE(VIDEO) && USE(GSTREAMER)
 
 #include "ColorSpace.h"
 #include "Document.h"

Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h (94154 => 94155)


--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h	2011-08-31 06:59:54 UTC (rev 94154)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h	2011-08-31 07:02:12 UTC (rev 94155)
@@ -22,7 +22,7 @@
 
 #ifndef MediaPlayerPrivateGStreamer_h
 #define MediaPlayerPrivateGStreamer_h
-#if USE(GSTREAMER)
+#if ENABLE(VIDEO) && USE(GSTREAMER)
 
 #include <wtf/Forward.h>
 #include "MediaPlayerPrivate.h"

Modified: trunk/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindow.h (94154 => 94155)


--- trunk/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindow.h	2011-08-31 06:59:54 UTC (rev 94154)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindow.h	2011-08-31 07:02:12 UTC (rev 94155)
@@ -19,7 +19,7 @@
 
 #ifndef PlatformVideoWindow_h
 #define PlatformVideoWindow_h
-#if USE(GSTREAMER)
+#if ENABLE(VIDEO) && USE(GSTREAMER)
 
 #include "Widget.h"
 #include <wtf/PassRefPtr.h>

Modified: trunk/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowGtk.cpp (94154 => 94155)


--- trunk/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowGtk.cpp	2011-08-31 06:59:54 UTC (rev 94154)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowGtk.cpp	2011-08-31 07:02:12 UTC (rev 94155)
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "PlatformVideoWindow.h"
-#if USE(GSTREAMER)
+#if ENABLE(VIDEO) && USE(GSTREAMER)
 
 #include <gtk/gtk.h>

Modified: trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp (94154 => 94155)


--- trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp	2011-08-31 06:59:54 UTC (rev 94154)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp	2011-08-31 07:02:12 UTC (rev 94155)
@@ -28,7 +28,7 @@
 
 #include "config.h"
 #include "VideoSinkGStreamer.h"
-#if USE(GSTREAMER)
+#if ENABLE(VIDEO) && USE(GSTREAMER)
 
 #include <glib.h>
 #include <gst/gst.h>

Modified: trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.h (94154 => 94155)


--- trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.h	2011-08-31 06:59:54 UTC (rev 94154)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.h	2011-08-31 07:02:12 UTC (rev 94155)
@@ -20,7 +20,7 @@
 #ifndef VideoSinkGStreamer_h
 #define VideoSinkGStreamer_h
 
-#if USE(GSTREAMER)
+#if ENABLE(VIDEO) && USE(GSTREAMER)
 
 #include <glib-object.h>
 #include <gst/video/gstvideosink.h>

Modified: trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (94154 => 94155)


--- trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp	2011-08-31 06:59:54 UTC (rev 94154)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp	2011-08-31 07:02:12 UTC (rev 94155)
@@ -18,7 +18,7 @@
 
 #include "config.h"
 #include "WebKitWebSourceGStreamer.h"
-#if USE(GSTREAMER)
+#if ENABLE(VIDEO) && USE(GSTREAMER)
 
 #include "Document.h"
 #include "GOwnPtr.h"

Modified: trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.h (94154 => 94155)


--- trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.h	2011-08-31 06:59:54 UTC (rev 94154)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.h	2011-08-31 07:02:12 UTC (rev 94155)
@@ -18,7 +18,7 @@
 
 #ifndef WebKitWebSourceGStreamer_h
 #define WebKitWebSourceGStreamer_h
-#if USE(GSTREAMER)
+#if ENABLE(VIDEO) && USE(GSTREAMER)
 
 #include "Frame.h"
 #include <gst/gst.h>

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to