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

[ossy at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit b7a30c6061d03821ef825a9c97e867affc381369
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 12 21:55:44 2010 +0000

    2010-08-12  Csaba Osztrogonác  <ossy at webkit.org>
    
            Reviewed by Darin Adler.
    
            generate-bindings.pl should generate warning free code
            https://bugs.webkit.org/show_bug.cgi?id=43353
    
            * bindings/scripts/CodeGeneratorJS.pm: Suggested parentheses added around && within ||
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65269 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4361419..64f892c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-12  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Reviewed by Darin Adler.
+
+        generate-bindings.pl should generate warning free code
+        https://bugs.webkit.org/show_bug.cgi?id=43353
+
+        * bindings/scripts/CodeGeneratorJS.pm: Suggested parentheses added around && within ||
+
 2010-08-11  Ryosuke Niwa  <rniwa at webkit.org>
 
         Reviewed by Kent Tamura.
diff --git a/WebCore/bindings/scripts/CodeGeneratorJS.pm b/WebCore/bindings/scripts/CodeGeneratorJS.pm
index cb7c333..f48159b 100644
--- a/WebCore/bindings/scripts/CodeGeneratorJS.pm
+++ b/WebCore/bindings/scripts/CodeGeneratorJS.pm
@@ -1135,7 +1135,7 @@ sub GenerateParametersCheckExpression
         # these are acceptable values for a DOMString argument (any Object can
         # be converted to a string via .toString).
         push(@andExpression, "(${value}.isNull() || ${value}.isUndefined() || ${value}.isString() || ${value}.isObject())") if $codeGenerator->IsStringType($type);
-        push(@andExpression, "(${value}.isNull() || ${value}.isObject() && asObject(${value})->inherits(&JS${type}::s_info))") unless IsNativeType($type);
+        push(@andExpression, "(${value}.isNull() || (${value}.isObject() && asObject(${value})->inherits(&JS${type}::s_info)))") unless IsNativeType($type);
 
         $parameterIndex++;
     }

-- 
WebKit Debian packaging