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

[mrobinson at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 6d22ea831c9d89b50455b87bd61be68e33f81ad1
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 23 23:09:02 2010 +0000

    2010-09-23  Martin Robinson  <mrobinson at igalia.com>
    
            Reviewed by Nate Chapin.
    
            [GTK] r68199 introduced two test failures
            https://bugs.webkit.org/show_bug.cgi?id=46424
    
            Fix a regression handling preference overrides that are attached to boolean properties.
    
            * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
            (LayoutTestController::overridePreference): g_strcasecmp returns 0 when strings match
            so we must check for that when converting a string to a boolean.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68211 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 6cdac30..9e3f227 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-23  Martin Robinson  <mrobinson at igalia.com>
+
+        Reviewed by Nate Chapin.
+
+        [GTK] r68199 introduced two test failures
+        https://bugs.webkit.org/show_bug.cgi?id=46424
+
+        Fix a regression handling preference overrides that are attached to boolean properties.
+
+        * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
+        (LayoutTestController::overridePreference): g_strcasecmp returns 0 when strings match
+        so we must check for that when converting a string to a boolean.
+
 2010-09-23  Dimitri Glazkov  <dglazkov at chromium.org>
 
         Reviewed by David Levin.
diff --git a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
index 973b08d..ef890cc 100644
--- a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
@@ -683,8 +683,8 @@ void LayoutTestController::overridePreference(JSStringRef key, JSStringRef value
     if (G_VALUE_HOLDS_STRING(&currentPropertyValue))
         g_object_set(settings, propertyName, valueAsString.get(), NULL);
     else if (G_VALUE_HOLDS_BOOLEAN(&currentPropertyValue))
-        g_object_set(G_OBJECT(settings), propertyName, g_ascii_strcasecmp(valueAsString.get(), "true") 
-                        || g_ascii_strcasecmp(valueAsString.get(), "1"), NULL);
+        g_object_set(G_OBJECT(settings), propertyName, !g_ascii_strcasecmp(valueAsString.get(), "true")
+                        || !g_ascii_strcasecmp(valueAsString.get(), "1"), NULL);
     else if (G_VALUE_HOLDS_INT(&currentPropertyValue))
         g_object_set(G_OBJECT(settings), propertyName, atoi(valueAsString.get()), NULL);
     else if (G_VALUE_HOLDS_FLOAT(&currentPropertyValue)) {

-- 
WebKit Debian packaging