Diff
Modified: trunk/Source/WebCore/ChangeLog (109914 => 109915)
--- trunk/Source/WebCore/ChangeLog 2012-03-06 14:10:12 UTC (rev 109914)
+++ trunk/Source/WebCore/ChangeLog 2012-03-06 15:02:46 UTC (rev 109915)
@@ -1,3 +1,25 @@
+2012-01-26 Philippe Normand <[email protected]>
+
+ [GStreamer] disable GStreamerGWorld when building against 0.11
+ https://bugs.webkit.org/show_bug.cgi?id=77088
+
+ Reviewed by Martin Robinson.
+
+ Don't build GStreamerGWorld and PlatformVideoWindow under
+ GStreamer 0.11. It's supposed to be removed soon anyway.
+
+ * platform/graphics/gstreamer/GStreamerGWorld.cpp:
+ * platform/graphics/gstreamer/GStreamerGWorld.h:
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ (WebCore::MediaPlayerPrivateGStreamer::totalBytes):
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
+ (MediaPlayerPrivateGStreamer):
+ * platform/graphics/gstreamer/PlatformVideoWindow.h:
+ * platform/graphics/gstreamer/PlatformVideoWindowEfl.cpp:
+ * platform/graphics/gstreamer/PlatformVideoWindowGtk.cpp:
+ * platform/graphics/gstreamer/PlatformVideoWindowMac.mm:
+ * platform/graphics/gstreamer/PlatformVideoWindowQt.cpp:
+
2012-03-06 Alexander Færøy <[email protected]>
Rename m_tileCreationTimer in the tiled backing store
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerGWorld.cpp (109914 => 109915)
--- trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerGWorld.cpp 2012-03-06 14:10:12 UTC (rev 109914)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerGWorld.cpp 2012-03-06 15:02:46 UTC (rev 109915)
@@ -19,7 +19,7 @@
#include "config.h"
#include "GStreamerGWorld.h"
-#if ENABLE(VIDEO) && USE(GSTREAMER)
+#if ENABLE(VIDEO) && USE(GSTREAMER) && !defined(GST_API_VERSION_1)
#include "GRefPtrGStreamer.h"
#include <gst/gst.h>
@@ -216,4 +216,4 @@
}
}
-#endif // USE(GSTREAMER)
+#endif // ENABLE(VIDEO) && USE(GSTREAMER) && !defined(GST_API_VERSION_1)
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerGWorld.h (109914 => 109915)
--- trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerGWorld.h 2012-03-06 14:10:12 UTC (rev 109914)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerGWorld.h 2012-03-06 15:02:46 UTC (rev 109915)
@@ -20,7 +20,7 @@
#ifndef GStreamerGWorld_h
#define GStreamerGWorld_h
-#if ENABLE(VIDEO) && USE(GSTREAMER)
+#if ENABLE(VIDEO) && USE(GSTREAMER) && !defined(GST_API_VERSION_1)
#include "GOwnPtr.h"
#include "PlatformVideoWindow.h"
@@ -65,5 +65,5 @@
};
}
-#endif // USE(GSTREAMER)
+#endif // ENABLE(VIDEO) && USE(GSTREAMER) && !defined(GST_API_VERSION_1)
#endif
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (109914 => 109915)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2012-03-06 14:10:12 UTC (rev 109914)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2012-03-06 15:02:46 UTC (rev 109915)
@@ -1698,8 +1698,10 @@
PlatformMedia MediaPlayerPrivateGStreamer::platformMedia() const
{
PlatformMedia p;
+#ifndef GST_API_VERSION_1
p.type = PlatformMedia::GStreamerGWorldType;
p.media.gstreamerGWorld = m_gstGWorld.get();
+#endif
return p;
}
@@ -1727,7 +1729,9 @@
ASSERT(!m_playBin);
m_playBin = gst_element_factory_make(gPlaybinName, "play");
+#ifndef GST_API_VERSION_1
m_gstGWorld = GStreamerGWorld::createGWorld(m_playBin);
+#endif
GstBus* bus = gst_pipeline_get_bus(GST_PIPELINE(m_playBin));
gst_bus_add_signal_watch(bus);
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h (109914 => 109915)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2012-03-06 14:10:12 UTC (rev 109914)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2012-03-06 15:02:46 UTC (rev 109915)
@@ -180,7 +180,9 @@
MediaPlayer::Preload m_preload;
bool m_delayingLoad;
bool m_mediaDurationKnown;
+#ifndef GST_API_VERSION_1
RefPtr<GStreamerGWorld> m_gstGWorld;
+#endif
guint m_volumeTimerHandler;
guint m_muteTimerHandler;
bool m_hasVideo;
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindow.h (109914 => 109915)
--- trunk/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindow.h 2012-03-06 14:10:12 UTC (rev 109914)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindow.h 2012-03-06 15:02:46 UTC (rev 109915)
@@ -19,7 +19,7 @@
#ifndef PlatformVideoWindow_h
#define PlatformVideoWindow_h
-#if ENABLE(VIDEO) && USE(GSTREAMER)
+#if ENABLE(VIDEO) && USE(GSTREAMER) && !defined(GST_API_VERSION_1)
#include "Widget.h"
#include <wtf/PassRefPtr.h>
@@ -61,5 +61,5 @@
};
}
-#endif // USE(GSTREAMER)
+#endif // USE(GSTREAMER) && !defined(GST_API_VERSION_1)
#endif
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowEfl.cpp (109914 => 109915)
--- trunk/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowEfl.cpp 2012-03-06 14:10:12 UTC (rev 109914)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowEfl.cpp 2012-03-06 15:02:46 UTC (rev 109915)
@@ -19,7 +19,7 @@
#include "config.h"
#include "PlatformVideoWindow.h"
-#if USE(GSTREAMER)
+#if USE(GSTREAMER) && !defined(GST_API_VERSION_1)
#include "NotImplemented.h"
@@ -39,4 +39,4 @@
{
}
-#endif // USE(GSTREAMER)
+#endif // USE(GSTREAMER) && !defined(GST_API_VERSION_1)
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowGtk.cpp (109914 => 109915)
--- trunk/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowGtk.cpp 2012-03-06 14:10:12 UTC (rev 109914)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowGtk.cpp 2012-03-06 15:02:46 UTC (rev 109915)
@@ -19,7 +19,7 @@
#include "config.h"
#include "PlatformVideoWindow.h"
-#if ENABLE(VIDEO) && USE(GSTREAMER)
+#if ENABLE(VIDEO) && USE(GSTREAMER) && !defined(GST_API_VERSION_1)
#include <gtk/gtk.h>
@@ -65,5 +65,5 @@
void PlatformVideoWindow::prepareForOverlay(GstMessage*)
{
}
-#endif // USE(GSTREAMER)
+#endif // ENABLE(VIDEO) && USE(GSTREAMER) && !defined(GST_API_VERSION_1)
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowMac.mm (109914 => 109915)
--- trunk/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowMac.mm 2012-03-06 14:10:12 UTC (rev 109914)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowMac.mm 2012-03-06 15:02:46 UTC (rev 109915)
@@ -20,7 +20,7 @@
#include "config.h"
#include "PlatformVideoWindow.h"
-#if USE(GSTREAMER)
+#if USE(GSTREAMER) && !defined(GST_API_VERSION_1)
#include <gst/gst.h>
@@ -46,4 +46,4 @@
}
}
-#endif // USE(GSTREAMER)
+#endif // USE(GSTREAMER) && !defined(GST_API_VERSION_1)
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowQt.cpp (109914 => 109915)
--- trunk/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowQt.cpp 2012-03-06 14:10:12 UTC (rev 109914)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowQt.cpp 2012-03-06 15:02:46 UTC (rev 109915)
@@ -19,6 +19,7 @@
#include "config.h"
#include "PlatformVideoWindow.h"
+#if ENABLE(VIDEO) && USE(GSTREAMER) && !defined(GST_API_VERSION_1)
#include "HTMLVideoElement.h"
#include "PlatformVideoWindowPrivate.h"
@@ -150,3 +151,4 @@
void PlatformVideoWindow::prepareForOverlay(GstMessage*)
{
}
+#endif // ENABLE(VIDEO) && USE(GSTREAMER) && !defined(GST_API_VERSION_1)
Modified: trunk/Source/WebKit/gtk/ChangeLog (109914 => 109915)
--- trunk/Source/WebKit/gtk/ChangeLog 2012-03-06 14:10:12 UTC (rev 109914)
+++ trunk/Source/WebKit/gtk/ChangeLog 2012-03-06 15:02:46 UTC (rev 109915)
@@ -1,3 +1,22 @@
+2012-01-26 Philippe Normand <[email protected]>
+
+ [GStreamer] disable GStreamerGWorld when building against 0.11
+ https://bugs.webkit.org/show_bug.cgi?id=77088
+
+ Disable the FullscreenVideoController if we build against
+ GStreamer 0.11. This code depends on GStreamerGWorld which wasn't
+ ported to 0.11 because it will soon be removed anyway.
+
+ Reviewed by Martin Robinson.
+
+ * WebCoreSupport/FullscreenVideoController.cpp:
+ * WebCoreSupport/FullscreenVideoController.h:
+ * webkit/webkitwebview.cpp:
+ (webViewEnterFullscreen):
+ (webViewExitFullscreen):
+ * webkit/webkitwebviewprivate.h:
+ (_WebKitWebViewPrivate):
+
2012-03-05 Zan Dobersek <[email protected]>
[GTK] plugins/netscape-plugin-page-cache-works.html fails
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp (109914 => 109915)
--- trunk/Source/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp 2012-03-06 14:10:12 UTC (rev 109914)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp 2012-03-06 15:02:46 UTC (rev 109915)
@@ -19,7 +19,7 @@
#include "config.h"
-#if ENABLE(VIDEO)
+#if ENABLE(VIDEO) && !defined(GST_API_VERSION_1)
#include "FullscreenVideoController.h"
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/FullscreenVideoController.h (109914 => 109915)
--- trunk/Source/WebKit/gtk/WebCoreSupport/FullscreenVideoController.h 2012-03-06 14:10:12 UTC (rev 109914)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/FullscreenVideoController.h 2012-03-06 15:02:46 UTC (rev 109915)
@@ -20,7 +20,7 @@
#ifndef FullscreenVideoController_h
#define FullscreenVideoController_h
-#if ENABLE(VIDEO)
+#if ENABLE(VIDEO) && !defined(GST_API_VERSION_1)
#include "GRefPtr.h"
#include "GStreamerGWorld.h"
Modified: trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp (109914 => 109915)
--- trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp 2012-03-06 14:10:12 UTC (rev 109914)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp 2012-03-06 15:02:46 UTC (rev 109915)
@@ -5114,7 +5114,7 @@
if (!node->hasTagName(HTMLNames::videoTag))
return;
-#if ENABLE(VIDEO)
+#if ENABLE(VIDEO) && !defined(GST_API_VERSION_1)
HTMLMediaElement* videoElement = static_cast<HTMLMediaElement*>(node);
WebKitWebViewPrivate* priv = webView->priv;
@@ -5130,7 +5130,7 @@
void webViewExitFullscreen(WebKitWebView* webView)
{
-#if ENABLE(VIDEO)
+#if ENABLE(VIDEO) && !defined(GST_API_VERSION_1)
WebKitWebViewPrivate* priv = webView->priv;
if (priv->fullscreenVideoController)
priv->fullscreenVideoController->exitFullscreen();
Modified: trunk/Source/WebKit/gtk/webkit/webkitwebviewprivate.h (109914 => 109915)
--- trunk/Source/WebKit/gtk/webkit/webkitwebviewprivate.h 2012-03-06 14:10:12 UTC (rev 109914)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebviewprivate.h 2012-03-06 15:02:46 UTC (rev 109915)
@@ -80,7 +80,7 @@
gboolean disposing;
-#if ENABLE(VIDEO)
+#if ENABLE(VIDEO) && !defined(GST_API_VERSION_1)
FullscreenVideoController* fullscreenVideoController;
#endif
Modified: trunk/Source/WebKit/qt/ChangeLog (109914 => 109915)
--- trunk/Source/WebKit/qt/ChangeLog 2012-03-06 14:10:12 UTC (rev 109914)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-03-06 15:02:46 UTC (rev 109915)
@@ -1,3 +1,24 @@
+2012-03-06 Philippe Normand <[email protected]>
+
+ [GStreamer] disable GStreamerGWorld when building against 0.11
+ https://bugs.webkit.org/show_bug.cgi?id=77088
+
+ Reviewed by Martin Robinson.
+
+ * WebCoreSupport/ChromeClientQt.cpp:
+ (WebCore::ChromeClientQt::ChromeClientQt):
+ (WebCore::ChromeClientQt::~ChromeClientQt):
+ (WebCore):
+ * WebCoreSupport/FullScreenVideoQt.cpp:
+ (WebCore):
+ (WebCore::FullScreenVideoQt::FullScreenVideoQt):
+ (WebCore::FullScreenVideoQt::~FullScreenVideoQt):
+ (WebCore::FullScreenVideoQt::enterFullScreenForNode):
+ (WebCore::FullScreenVideoQt::exitFullScreenForNode):
+ (WebCore::FullScreenVideoQt::isValid):
+ * WebCoreSupport/FullScreenVideoQt.h:
+ (WebCore):
+
2012-03-03 Simon Hausmann <[email protected]>
[Qt] Fix static_libs_as_shared build
Modified: trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp (109914 => 109915)
--- trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp 2012-03-06 14:10:12 UTC (rev 109914)
+++ trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp 2012-03-06 15:02:46 UTC (rev 109915)
@@ -73,7 +73,7 @@
#include <wtf/OwnPtr.h>
#include <wtf/qt/UtilsQt.h>
-#if ENABLE(VIDEO) && (USE(GSTREAMER) || USE(QT_MULTIMEDIA) || USE(QTKIT))
+#if ENABLE(VIDEO) && ((USE(GSTREAMER) && !defined(GST_API_VERSION_1)) || USE(QT_MULTIMEDIA) || USE(QTKIT))
#include "FullScreenVideoQt.h"
#include "HTMLMediaElement.h"
#include "HTMLNames.h"
@@ -90,7 +90,7 @@
ChromeClientQt::ChromeClientQt(QWebPage* webPage)
: m_webPage(webPage)
, m_eventLoop(0)
-#if ENABLE(VIDEO) && (USE(GSTREAMER) || USE(QT_MULTIMEDIA) || USE(QTKIT))
+#if ENABLE(VIDEO) && ((USE(GSTREAMER) && !defined(GST_API_VERSION_1)) || USE(QT_MULTIMEDIA) || USE(QTKIT))
, m_fullScreenVideo(0)
#endif
{
@@ -102,7 +102,7 @@
if (m_eventLoop)
m_eventLoop->exit();
-#if ENABLE(VIDEO) && (USE(GSTREAMER) || USE(QT_MULTIMEDIA) || USE(QTKIT))
+#if ENABLE(VIDEO) && ((USE(GSTREAMER) && !defined(GST_API_VERSION_1)) || USE(QT_MULTIMEDIA) || USE(QTKIT))
delete m_fullScreenVideo;
#endif
}
@@ -650,7 +650,7 @@
}
#endif
-#if ENABLE(VIDEO) && (USE(GSTREAMER) || USE(QT_MULTIMEDIA) || USE(QTKIT))
+#if ENABLE(VIDEO) && ((USE(GSTREAMER) && !defined(GST_API_VERSION_1)) || USE(QT_MULTIMEDIA) || USE(QTKIT))
FullScreenVideoQt* ChromeClientQt::fullScreenVideo()
{
if (!m_fullScreenVideo)
Modified: trunk/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.cpp (109914 => 109915)
--- trunk/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.cpp 2012-03-06 14:10:12 UTC (rev 109914)
+++ trunk/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.cpp 2012-03-06 15:02:46 UTC (rev 109915)
@@ -47,7 +47,7 @@
namespace WebCore {
-#if USE(GSTREAMER)
+#if USE(GSTREAMER) && !defined(GST_API_VERSION_1)
GStreamerFullScreenVideoHandler::GStreamerFullScreenVideoHandler()
: m_videoElement(0)
, m_fullScreenWidget(0)
@@ -148,7 +148,7 @@
connect(m_FullScreenVideoHandler, SIGNAL(fullScreenClosed()), this, SLOT(aboutToClose()));
#endif
-#if USE(GSTREAMER)
+#if USE(GSTREAMER) && !defined(GST_API_VERSION_1)
m_FullScreenVideoHandlerGStreamer = new GStreamerFullScreenVideoHandler;
#endif
@@ -162,7 +162,7 @@
#if USE(QT_MULTIMEDIA)
delete m_FullScreenVideoHandler;
#endif
-#if USE(GSTREAMER)
+#if USE(GSTREAMER) && !defined(GST_API_VERSION_1)
delete m_FullScreenVideoHandlerGStreamer;
#endif
#if USE(QTKIT)
@@ -192,7 +192,7 @@
m_FullScreenVideoHandler->enterFullScreen(mediaPlayerQt->mediaPlayer());
#endif
-#if USE(GSTREAMER)
+#if USE(GSTREAMER) && !defined(GST_API_VERSION_1)
m_FullScreenVideoHandlerGStreamer->setVideoElement(m_videoElement);
m_FullScreenVideoHandlerGStreamer->enterFullScreen();
#endif
@@ -223,7 +223,7 @@
MediaPlayerPrivateQt* mediaPlayerQt = mediaPlayer();
mediaPlayerQt->restoreVideoItem();
#endif
-#if USE(GSTREAMER)
+#if USE(GSTREAMER) && !defined(GST_API_VERSION_1)
m_FullScreenVideoHandlerGStreamer->exitFullScreen();
#endif
@@ -262,7 +262,7 @@
#if USE(QT_MULTIMEDIA)
return m_FullScreenVideoHandler;
#endif
-#if USE(GSTREAMER)
+#if USE(GSTREAMER) && !defined(GST_API_VERSION_1)
return m_FullScreenVideoHandlerGStreamer;
#elif USE(QTKIT)
return m_FullScreenVideoHandlerQTKit;
Modified: trunk/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.h (109914 => 109915)
--- trunk/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.h 2012-03-06 14:10:12 UTC (rev 109914)
+++ trunk/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.h 2012-03-06 15:02:46 UTC (rev 109915)
@@ -43,7 +43,7 @@
#endif
// We do not use ENABLE or USE because moc does not expand these macros.
-#if defined(WTF_USE_GSTREAMER) && WTF_USE_GSTREAMER
+#if defined(WTF_USE_GSTREAMER) && WTF_USE_GSTREAMER && !defined(GST_API_VERSION_1)
class FullScreenVideoWindow;
class GStreamerFullScreenVideoHandler : public QObject {
