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

[ggaren at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 0138e1a0c6aeeb1eed8207cd9487e7864447c140
Author: ggaren at apple.com <ggaren at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 14 18:40:59 2009 +0000

    https://bugs.webkit.org/show_bug.cgi?id=32524
    REGRESSION(52084): fast/dom/prototypes.html failing two CSS tests
    
    Reviewed by Simon Fraser.
    
    * wtf/StdLibExtras.h:
    (WTF::bitCount): The original patch put the parentheses in the wrong
    place, completely changing the calculation and making it almost always
    wrong. Moved the parentheses around the '+' operation, like the original
    compiler warning suggested.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52101 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 58f0f9a..5332875 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,16 @@
+2009-12-14  Geoffrey Garen  <ggaren at apple.com>
+
+        Reviewed by Simon Fraser.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32524
+        REGRESSION(52084): fast/dom/prototypes.html failing two CSS tests
+
+        * wtf/StdLibExtras.h:
+        (WTF::bitCount): The original patch put the parentheses in the wrong
+        place, completely changing the calculation and making it almost always
+        wrong. Moved the parentheses around the '+' operation, like the original
+        compiler warning suggested.
+
 2009-12-14  Gabor Loki  <loki at inf.u-szeged.hu>
 
         Unreviewed trivial buildfix.
diff --git a/JavaScriptCore/wtf/StdLibExtras.h b/JavaScriptCore/wtf/StdLibExtras.h
index 9d7b36b..9dfb969 100644
--- a/JavaScriptCore/wtf/StdLibExtras.h
+++ b/JavaScriptCore/wtf/StdLibExtras.h
@@ -74,7 +74,7 @@ namespace WTF {
     {
         bits = bits - ((bits >> 1) & 0x55555555);
         bits = (bits & 0x33333333) + ((bits >> 2) & 0x33333333);
-        return ((bits + ((bits >> 4) & 0xF0F0F0F)) * 0x1010101) >> 24;
+        return (((bits + (bits >> 4)) & 0xF0F0F0F) * 0x1010101) >> 24;
     }
 
 } // namespace WTF

-- 
WebKit Debian packaging