[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
mrobinson at webkit.org
mrobinson at webkit.org
Wed Dec 22 13:07:48 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 06d3abb35cb333f4f1ff74f30c80d9bf29a206d4
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Sep 7 16:40:53 2010 +0000
2010-09-07 Martin Robinson <mrobinson at igalia.com>
Reviewed by Xan Lopez.
[GTK] Fix some feature guards
https://bugs.webkit.org/show_bug.cgi?id=45302
No new tests as this is just a build change.
* platform/graphics/gstreamer/DataSourceGStreamer.cpp: Guard with #if ENABLE(VIDEO)
* platform/graphics/gstreamer/DataSourceGStreamer.h: Ditto.
* platform/graphics/gstreamer/GOwnPtrGStreamer.cpp: Ditto.
* platform/graphics/gstreamer/GOwnPtrGStreamer.h: Ditto.
* platform/graphics/gstreamer/GStreamerGWorld.cpp: Ditto.
* platform/graphics/gstreamer/GStreamerGWorld.h: Ditto.
* platform/graphics/gstreamer/ImageGStreamer.h: Ditto.
* platform/graphics/gstreamer/ImageGStreamerCG.mm: Ditto.
* platform/graphics/gstreamer/ImageGStreamerCairo.cpp: Ditto.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp: Ditto.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h: Ditto.
* platform/graphics/gstreamer/PlatformVideoWindow.h: Ditto.
* platform/graphics/gstreamer/PlatformVideoWindowEfl.cpp: Ditto.
* platform/graphics/gstreamer/PlatformVideoWindowGtk.cpp: Ditto.
* platform/graphics/gstreamer/VideoSinkGStreamer.cpp: Ditto.
* platform/graphics/gstreamer/VideoSinkGStreamer.h: Ditto.
* platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp: Ditto.
* platform/graphics/gstreamer/WebKitWebSourceGStreamer.h: Ditto.
* platform/gtk/GeolocationServiceGtk.cpp: Guard with ENABLE(GEOLOCATION)
* platform/gtk/GeolocationServiceGtk.h: Ditto.
2010-09-07 Martin Robinson <mrobinson at igalia.com>
Reviewed by Xan Lopez.
[GTK] Fix some feature guards
https://bugs.webkit.org/show_bug.cgi?id=45302
* webkit/webkitprivate.h: Add ENABLE(VIDEO) guards for video specific members.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66887 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 97c2153..32f24b7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,33 @@
+2010-09-07 Martin Robinson <mrobinson at igalia.com>
+
+ Reviewed by Xan Lopez.
+
+ [GTK] Fix some feature guards
+ https://bugs.webkit.org/show_bug.cgi?id=45302
+
+ No new tests as this is just a build change.
+
+ * platform/graphics/gstreamer/DataSourceGStreamer.cpp: Guard with #if ENABLE(VIDEO)
+ * platform/graphics/gstreamer/DataSourceGStreamer.h: Ditto.
+ * platform/graphics/gstreamer/GOwnPtrGStreamer.cpp: Ditto.
+ * platform/graphics/gstreamer/GOwnPtrGStreamer.h: Ditto.
+ * platform/graphics/gstreamer/GStreamerGWorld.cpp: Ditto.
+ * platform/graphics/gstreamer/GStreamerGWorld.h: Ditto.
+ * platform/graphics/gstreamer/ImageGStreamer.h: Ditto.
+ * platform/graphics/gstreamer/ImageGStreamerCG.mm: Ditto.
+ * platform/graphics/gstreamer/ImageGStreamerCairo.cpp: Ditto.
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp: Ditto.
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h: Ditto.
+ * platform/graphics/gstreamer/PlatformVideoWindow.h: Ditto.
+ * platform/graphics/gstreamer/PlatformVideoWindowEfl.cpp: Ditto.
+ * platform/graphics/gstreamer/PlatformVideoWindowGtk.cpp: Ditto.
+ * platform/graphics/gstreamer/VideoSinkGStreamer.cpp: Ditto.
+ * platform/graphics/gstreamer/VideoSinkGStreamer.h: Ditto.
+ * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp: Ditto.
+ * platform/graphics/gstreamer/WebKitWebSourceGStreamer.h: Ditto.
+ * platform/gtk/GeolocationServiceGtk.cpp: Guard with ENABLE(GEOLOCATION)
+ * platform/gtk/GeolocationServiceGtk.h: Ditto.
+
2010-09-07 Jonathan Dixon <joth at chromium.org>
Reviewed by Jeremy Orlow.
diff --git a/WebCore/platform/graphics/gstreamer/DataSourceGStreamer.cpp b/WebCore/platform/graphics/gstreamer/DataSourceGStreamer.cpp
index 567da74..63555bf 100644
--- a/WebCore/platform/graphics/gstreamer/DataSourceGStreamer.cpp
+++ b/WebCore/platform/graphics/gstreamer/DataSourceGStreamer.cpp
@@ -18,6 +18,7 @@
#include "config.h"
#include "DataSourceGStreamer.h"
+#if ENABLE(VIDEO)
#include <gio/gio.h>
#include <glib.h>
@@ -241,3 +242,5 @@ static void webkit_data_src_uri_handler_init(gpointer g_iface, gpointer iface_da
iface->get_uri = webkit_data_src_uri_get_uri;
iface->set_uri = webkit_data_src_uri_set_uri;
}
+
+#endif // ENABLE(VIDEO)
diff --git a/WebCore/platform/graphics/gstreamer/DataSourceGStreamer.h b/WebCore/platform/graphics/gstreamer/DataSourceGStreamer.h
index 38f69b1..453685a 100644
--- a/WebCore/platform/graphics/gstreamer/DataSourceGStreamer.h
+++ b/WebCore/platform/graphics/gstreamer/DataSourceGStreamer.h
@@ -19,6 +19,8 @@
#ifndef DataSourceGStreamer_h
#define DataSourceGStreamer_h
+#if ENABLE(VIDEO)
+
#include <glib-object.h>
#include <gst/base/gstbasesrc.h>
@@ -51,4 +53,5 @@ GType webkit_data_src_get_type(void);
G_END_DECLS
+#endif // ENABLE(VIDEO)
#endif
diff --git a/WebCore/platform/graphics/gstreamer/GOwnPtrGStreamer.cpp b/WebCore/platform/graphics/gstreamer/GOwnPtrGStreamer.cpp
index 75bf5e7..6333437 100644
--- a/WebCore/platform/graphics/gstreamer/GOwnPtrGStreamer.cpp
+++ b/WebCore/platform/graphics/gstreamer/GOwnPtrGStreamer.cpp
@@ -32,4 +32,4 @@ template <> void freeOwnedGPtr<GstElement>(GstElement* ptr)
}
}
-#endif
+#endif // ENABLE(VIDEO)
diff --git a/WebCore/platform/graphics/gstreamer/GOwnPtrGStreamer.h b/WebCore/platform/graphics/gstreamer/GOwnPtrGStreamer.h
index 6655f38..84a3e30 100644
--- a/WebCore/platform/graphics/gstreamer/GOwnPtrGStreamer.h
+++ b/WebCore/platform/graphics/gstreamer/GOwnPtrGStreamer.h
@@ -19,6 +19,7 @@
#ifndef GOwnPtrGStreamer_h
#define GOwnPtrGStreamer_h
+#if ENABLE(VIDEO)
#include "GOwnPtr.h"
@@ -30,4 +31,5 @@ template<> void freeOwnedGPtr<GstElement>(GstElement* ptr);
}
+#endif // ENABLE(VIDEO)
#endif
diff --git a/WebCore/platform/graphics/gstreamer/GStreamerGWorld.cpp b/WebCore/platform/graphics/gstreamer/GStreamerGWorld.cpp
index e1efdd4..2ff4f38 100644
--- a/WebCore/platform/graphics/gstreamer/GStreamerGWorld.cpp
+++ b/WebCore/platform/graphics/gstreamer/GStreamerGWorld.cpp
@@ -18,11 +18,10 @@
*/
#include "config.h"
-
#include "GStreamerGWorld.h"
+#if ENABLE(VIDEO)
#include "GOwnPtrGStreamer.h"
-
#include <gst/gst.h>
#include <gst/interfaces/xoverlay.h>
@@ -200,3 +199,4 @@ void GStreamerGWorld::setWindowOverlay(GstMessage* message)
}
}
+#endif // ENABLE(VIDEO)
diff --git a/WebCore/platform/graphics/gstreamer/GStreamerGWorld.h b/WebCore/platform/graphics/gstreamer/GStreamerGWorld.h
index 659052a..282f13c 100644
--- a/WebCore/platform/graphics/gstreamer/GStreamerGWorld.h
+++ b/WebCore/platform/graphics/gstreamer/GStreamerGWorld.h
@@ -20,7 +20,6 @@
#ifndef GStreamerGWorld_h
#define GStreamerGWorld_h
-
#if ENABLE(VIDEO)
#include "PlatformVideoWindow.h"
@@ -63,5 +62,5 @@ private:
};
}
-#endif
+#endif // ENABLE(VIDEO)
#endif
diff --git a/WebCore/platform/graphics/gstreamer/ImageGStreamer.h b/WebCore/platform/graphics/gstreamer/ImageGStreamer.h
index 9288df9..4a4ff2b 100644
--- a/WebCore/platform/graphics/gstreamer/ImageGStreamer.h
+++ b/WebCore/platform/graphics/gstreamer/ImageGStreamer.h
@@ -23,7 +23,6 @@
#if ENABLE(VIDEO)
#include "BitmapImage.h"
-
#include <gst/gst.h>
#include <gst/video/video.h>
#include <wtf/PassRefPtr.h>
@@ -60,6 +59,5 @@ class ImageGStreamer : public RefCounted<ImageGStreamer> {
};
}
-#endif
-
+#endif // ENABLE(VIDEO)
#endif
diff --git a/WebCore/platform/graphics/gstreamer/ImageGStreamerCG.mm b/WebCore/platform/graphics/gstreamer/ImageGStreamerCG.mm
index 421b90f..076df4a 100644
--- a/WebCore/platform/graphics/gstreamer/ImageGStreamerCG.mm
+++ b/WebCore/platform/graphics/gstreamer/ImageGStreamerCG.mm
@@ -19,6 +19,7 @@
#include "config.h"
#include "ImageGStreamer.h"
+#if ENABLE(VIDEO)
using namespace WebCore;
@@ -55,3 +56,5 @@ ImageGStreamer::~ImageGStreamer()
m_image = 0;
}
+
+#endif // ENABLE(VIDEO)
diff --git a/WebCore/platform/graphics/gstreamer/ImageGStreamerCairo.cpp b/WebCore/platform/graphics/gstreamer/ImageGStreamerCairo.cpp
index aeaee19..2fed892 100644
--- a/WebCore/platform/graphics/gstreamer/ImageGStreamerCairo.cpp
+++ b/WebCore/platform/graphics/gstreamer/ImageGStreamerCairo.cpp
@@ -18,12 +18,13 @@
*/
#include "config.h"
+#include "ImageGStreamer.h"
+
+#if ENABLE(VIDEO)
#include "GOwnPtr.h"
-#include "ImageGStreamer.h"
using namespace std;
-
using namespace WebCore;
PassRefPtr<ImageGStreamer> ImageGStreamer::createImage(GstBuffer* buffer)
@@ -64,3 +65,4 @@ ImageGStreamer::~ImageGStreamer()
m_image = 0;
}
+#endif // ENABLE(VIDEO)
diff --git a/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
index 5628eb3..c9f63f5 100644
--- a/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
+++ b/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
@@ -22,11 +22,8 @@
*/
#include "config.h"
-
-#if ENABLE(VIDEO)
-
#include "MediaPlayerPrivateGStreamer.h"
-
+#if ENABLE(VIDEO)
#include "ColorSpace.h"
#include "DataSourceGStreamer.h"
@@ -49,14 +46,13 @@
#include "VideoSinkGStreamer.h"
#include "WebKitWebSourceGStreamer.h"
#include "Widget.h"
-#include <wtf/text/CString.h>
-
#include <GOwnPtr.h>
#include <gst/gst.h>
#include <gst/interfaces/mixer.h>
#include <gst/video/video.h>
#include <limits>
#include <math.h>
+#include <wtf/text/CString.h>
// GstPlayFlags flags from playbin2. It is the policy of GStreamer to
// not publicly expose element-specific enums. That's why this
@@ -1460,4 +1456,4 @@ void MediaPlayerPrivateGStreamer::createGSTPlayBin()
}
-#endif
+#endif // ENABLE(VIDEO)
diff --git a/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h b/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h
index f2f684b..cc1a731 100644
--- a/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h
+++ b/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h
@@ -22,7 +22,6 @@
#ifndef MediaPlayerPrivateGStreamer_h
#define MediaPlayerPrivateGStreamer_h
-
#if ENABLE(VIDEO)
#include <wtf/Forward.h>
@@ -179,5 +178,5 @@ class MediaPlayerPrivateGStreamer : public MediaPlayerPrivateInterface {
};
}
-#endif
+#endif // ENABLE(VIDEO)
#endif
diff --git a/WebCore/platform/graphics/gstreamer/PlatformVideoWindow.h b/WebCore/platform/graphics/gstreamer/PlatformVideoWindow.h
index 8d99f05..3c4904b 100644
--- a/WebCore/platform/graphics/gstreamer/PlatformVideoWindow.h
+++ b/WebCore/platform/graphics/gstreamer/PlatformVideoWindow.h
@@ -19,7 +19,6 @@
#ifndef PlatformVideoWindow_h
#define PlatformVideoWindow_h
-
#if ENABLE(VIDEO)
#include "Widget.h"
@@ -45,6 +44,5 @@ class PlatformVideoWindow : public RefCounted<PlatformVideoWindow> {
};
}
-#endif
-
+#endif // ENABLE(VIDEO)
#endif
diff --git a/WebCore/platform/graphics/gstreamer/PlatformVideoWindowEfl.cpp b/WebCore/platform/graphics/gstreamer/PlatformVideoWindowEfl.cpp
index 5c0e6ea..68ab7ac 100644
--- a/WebCore/platform/graphics/gstreamer/PlatformVideoWindowEfl.cpp
+++ b/WebCore/platform/graphics/gstreamer/PlatformVideoWindowEfl.cpp
@@ -19,6 +19,7 @@
#include "config.h"
#include "PlatformVideoWindow.h"
+#if ENABLE(VIDEO)
#include "NotImplemented.h"
@@ -33,3 +34,5 @@ PlatformVideoWindow::~PlatformVideoWindow()
{
notImplemented();
}
+
+#endif // ENABLE(VIDEO)
diff --git a/WebCore/platform/graphics/gstreamer/PlatformVideoWindowGtk.cpp b/WebCore/platform/graphics/gstreamer/PlatformVideoWindowGtk.cpp
index c5f835c..88b6552 100644
--- a/WebCore/platform/graphics/gstreamer/PlatformVideoWindowGtk.cpp
+++ b/WebCore/platform/graphics/gstreamer/PlatformVideoWindowGtk.cpp
@@ -19,8 +19,10 @@
#include "config.h"
#include "PlatformVideoWindow.h"
+#if ENABLE(VIDEO)
#include <gtk/gtk.h>
+
#ifdef GDK_WINDOWING_X11
#include <gdk/gdkx.h> // for GDK_WINDOW_XID
#endif
@@ -59,3 +61,4 @@ PlatformVideoWindow::~PlatformVideoWindow()
m_videoWindowId = 0;
}
+#endif // ENABLE(VIDEO)
diff --git a/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp b/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp
index dd8c3ee..00fef4b 100644
--- a/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp
+++ b/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp
@@ -28,6 +28,7 @@
#include "config.h"
#include "VideoSinkGStreamer.h"
+#if ENABLE(VIDEO)
#include <glib.h>
#include <gst/gst.h>
@@ -370,3 +371,4 @@ webkit_video_sink_new(void)
return (GstElement*)g_object_new(WEBKIT_TYPE_VIDEO_SINK, 0);
}
+#endif // ENABLE(VIDEO)
diff --git a/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.h b/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.h
index 4fb0b73..767e83f 100644
--- a/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.h
+++ b/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.h
@@ -20,6 +20,8 @@
#ifndef VideoSinkGStreamer_h
#define VideoSinkGStreamer_h
+#if ENABLE(VIDEO)
+
#include <glib-object.h>
#include <gst/video/gstvideosink.h>
@@ -75,4 +77,5 @@ GstElement *webkit_video_sink_new(void);
G_END_DECLS
+#endif // ENABLE(VIDEO)
#endif
diff --git a/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp b/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
index 1059b59..bcd59c6 100644
--- a/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
+++ b/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
@@ -18,6 +18,7 @@
#include "config.h"
#include "WebKitWebSourceGStreamer.h"
+#if ENABLE(VIDEO)
#include "Document.h"
#include "GOwnPtr.h"
@@ -790,3 +791,5 @@ void StreamingClient::cannotShowURL(ResourceHandle*)
GST_ELEMENT_ERROR(m_src, RESOURCE, OPEN_READ, ("Can't show \"%s\"", m_src->priv->uri), (0));
}
+#endif // ENABLE(VIDEO)
+
diff --git a/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.h b/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.h
index ae19640..1594062 100644
--- a/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.h
+++ b/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.h
@@ -18,6 +18,7 @@
#ifndef WebKitWebSourceGStreamer_h
#define WebKitWebSourceGStreamer_h
+#if ENABLE(VIDEO)
#include "Frame.h"
#include <gst/gst.h>
@@ -49,4 +50,5 @@ void webKitWebSrcSetFrame(WebKitWebSrc* src, WebCore::Frame* frame);
G_END_DECLS
+#endif // ENABLE(VIDEO)
#endif
diff --git a/WebCore/platform/gtk/GeolocationServiceGtk.cpp b/WebCore/platform/gtk/GeolocationServiceGtk.cpp
index 69a0843..5b34c68 100644
--- a/WebCore/platform/gtk/GeolocationServiceGtk.cpp
+++ b/WebCore/platform/gtk/GeolocationServiceGtk.cpp
@@ -19,6 +19,7 @@
#include "config.h"
#include "GeolocationServiceGtk.h"
+#if ENABLE(GEOLOCATION)
#include "GOwnPtr.h"
#include "NotImplemented.h"
@@ -211,3 +212,4 @@ void GeolocationServiceGtk::setError(PositionError::ErrorCode errorCode, const c
}
}
+#endif // ENABLE(GEOLOCATION)
diff --git a/WebCore/platform/gtk/GeolocationServiceGtk.h b/WebCore/platform/gtk/GeolocationServiceGtk.h
index c123017..46249ed 100644
--- a/WebCore/platform/gtk/GeolocationServiceGtk.h
+++ b/WebCore/platform/gtk/GeolocationServiceGtk.h
@@ -19,6 +19,7 @@
#ifndef GeolocationServiceGtk_h
#define GeolocationServiceGtk_h
+#if ENABLE(GEOLOCATION)
#include "GeolocationService.h"
#include "Geoposition.h"
@@ -70,4 +71,5 @@ namespace WebCore {
};
}
+#endif // ENABLE(GEOLOCATION)
#endif
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 52665b1..d81614d 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-07 Martin Robinson <mrobinson at igalia.com>
+
+ Reviewed by Xan Lopez.
+
+ [GTK] Fix some feature guards
+ https://bugs.webkit.org/show_bug.cgi?id=45302
+
+ * webkit/webkitprivate.h: Add ENABLE(VIDEO) guards for video specific members.
+
2010-09-03 Jesus Sanchez-Palencia <jesus.palencia at openbossa.org>
Reviewed by Darin Adler.
diff --git a/WebKit/gtk/webkit/webkitprivate.h b/WebKit/gtk/webkit/webkitprivate.h
index 92bb27d..bde5b55 100644
--- a/WebKit/gtk/webkit/webkitprivate.h
+++ b/WebKit/gtk/webkit/webkitprivate.h
@@ -163,7 +163,9 @@ extern "C" {
gboolean disposing;
gboolean usePrimaryForPaste;
+#if ENABLE(VIDEO)
FullscreenVideoController* fullscreenVideoController;
+#endif
// These are hosted here because the DataSource object is
// created too late in the frame loading process.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list