[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[philn at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 8138c306bc2d1345512dd1040878618fdef739dd
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 15 11:54:40 2010 +0000

    2010-01-14  Philippe Normand  <pnormand at igalia.com>
    
            Reviewed by Xan Lopez.
    
            [Gtk] Compiler warning: comparisons like 'X<=Y<=Z' do not have their mathematical meaning
            https://bugs.webkit.org/show_bug.cgi?id=33575
    
            Patch from Magnus Boman <captain.magnus at gmail.com>
    
            * platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp:
            (WebCore::mimeTypeCache): fix compiler warnings.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53329 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c987aa8..f2f063b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-14  Philippe Normand  <pnormand at igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [Gtk] Compiler warning: comparisons like 'X<=Y<=Z' do not have their mathematical meaning
+        https://bugs.webkit.org/show_bug.cgi?id=33575
+
+        Patch from Magnus Boman <captain.magnus at gmail.com>
+
+        * platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::mimeTypeCache): fix compiler warnings.
+
 2010-01-14  Mikhail Naganov  <mnaganov at chromium.org>
 
         Reviewed by Timothy Hatcher.
diff --git a/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp b/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp
index b99bd26..f0ff519 100644
--- a/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp
+++ b/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp
@@ -869,11 +869,11 @@ static HashSet<String> mimeTypeCache()
                         if (G_VALUE_TYPE(layer) == GST_TYPE_INT_RANGE) {
                             gint minLayer = gst_value_get_int_range_min(layer);
                             gint maxLayer = gst_value_get_int_range_max(layer);
-                            if (minLayer <= 1 <= maxLayer)
+                            if (minLayer <= 1 && 1 <= maxLayer)
                                 cache.add(String("audio/mp1"));
-                            if (minLayer <= 2 <= maxLayer)
+                            if (minLayer <= 2 && 2 <= maxLayer)
                                 cache.add(String("audio/mp2"));
-                            if (minLayer <= 3 <= maxLayer)
+                            if (minLayer <= 3 && 3 <= maxLayer)
                                 cache.add(String("audio/mp3"));
                         }
                     }

-- 
WebKit Debian packaging