[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 67ac880a217a241f338f90c1ea1d00398a2c67b8
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 2 06:49:23 2010 +0000

    2010-09-01  Philippe Normand  <pnormand at igalia.com>
    
            Reviewed by Martin Robinson.
    
            [GTK] warning: unused variable "queryResult"
            https://bugs.webkit.org/show_bug.cgi?id=44998
    
            Fix the misbehavior introduced in r66573. The gst_element_query()
            call needs to be done whatever the GStreamer version used.
    
            * platform/graphics/gstreamer/GStreamerGWorld.cpp:
            (WebCore::GStreamerGWorld::enterFullscreen):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66645 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ac879e1..186fafe 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-01  Philippe Normand  <pnormand at igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] warning: unused variable "queryResult"
+        https://bugs.webkit.org/show_bug.cgi?id=44998
+
+        Fix the misbehavior introduced in r66573. The gst_element_query()
+        call needs to be done whatever the GStreamer version used.
+
+        * platform/graphics/gstreamer/GStreamerGWorld.cpp:
+        (WebCore::GStreamerGWorld::enterFullscreen):
+
 2010-09-01  Jia Pu  <jpu at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebCore/platform/graphics/gstreamer/GStreamerGWorld.cpp b/WebCore/platform/graphics/gstreamer/GStreamerGWorld.cpp
index f222cde..01711e6 100644
--- a/WebCore/platform/graphics/gstreamer/GStreamerGWorld.cpp
+++ b/WebCore/platform/graphics/gstreamer/GStreamerGWorld.cpp
@@ -113,15 +113,18 @@ bool GStreamerGWorld::enterFullscreen()
     // the new tee branch downstream.
 
     GstQuery* query = gst_query_new_segment(GST_FORMAT_TIME);
+    gboolean queryResult = gst_element_query(m_pipeline, query);
 
-    // See https://bugzilla.gnome.org/show_bug.cgi?id=620490.
 #if GST_CHECK_VERSION(0, 10, 30)
-    gboolean queryResult = gst_element_query(m_pipeline, query);
     if (!queryResult) {
         gst_query_unref(query);
         gst_object_unref(GST_OBJECT(srcPad));
         return true;
     }
+#else
+    // GStreamer < 0.10.30 doesn't set the query result correctly.
+    // See https://bugzilla.gnome.org/show_bug.cgi?id=620490.
+    UNUSED_PARAM(queryResult);
 #endif
 
     GstFormat format;

-- 
WebKit Debian packaging