[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[philn at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 339669c026269420cb5906c0cd3bfecfb85d73ac
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 16 15:30:13 2010 +0000

    2010-09-15  Philippe Normand  <pnormand at igalia.com>
    
            Reviewed by Martin Robinson.
    
            [GStreamer] XOverlay API changes break the build
            https://bugs.webkit.org/show_bug.cgi?id=45810
    
            Cope with the GStreamer XOverlay API change for the upcoming
            0.10.31 version.
            No new tests, build fix only.
    
            * platform/graphics/gstreamer/GStreamerGWorld.cpp:
            (WebCore::GStreamerGWorld::setWindowOverlay):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67621 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d76bf22..8192a05 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-15  Philippe Normand  <pnormand at igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GStreamer] XOverlay API changes break the build
+        https://bugs.webkit.org/show_bug.cgi?id=45810
+
+        Cope with the GStreamer XOverlay API change for the upcoming
+        0.10.31 version.
+        No new tests, build fix only.
+
+        * platform/graphics/gstreamer/GStreamerGWorld.cpp:
+        (WebCore::GStreamerGWorld::setWindowOverlay):
+
 2010-09-16  Andreas Kling  <andreas.kling at nokia.com>
 
         Reviewed by Tor Arne Vestbø.
diff --git a/WebCore/platform/graphics/gstreamer/GStreamerGWorld.cpp b/WebCore/platform/graphics/gstreamer/GStreamerGWorld.cpp
index 2ff4f38..efccff0 100644
--- a/WebCore/platform/graphics/gstreamer/GStreamerGWorld.cpp
+++ b/WebCore/platform/graphics/gstreamer/GStreamerGWorld.cpp
@@ -195,7 +195,11 @@ void GStreamerGWorld::setWindowOverlay(GstMessage* message)
         g_object_set(sink, "force-aspect-ratio", TRUE, NULL);
 
     if (m_videoWindow)
+#if GST_CHECK_VERSION(0, 10, 31) || GST_VERSION_NANO
+        gst_x_overlay_set_window_handle(GST_X_OVERLAY(sink), m_videoWindow->videoWindowId());
+#else
         gst_x_overlay_set_xwindow_id(GST_X_OVERLAY(sink), m_videoWindow->videoWindowId());
+#endif
 }
 
 }

-- 
WebKit Debian packaging