[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[ggaren at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit ca7c58ce495bd8aa0229a514ed36a9392bced26e
Author: ggaren at apple.com <ggaren at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 12 21:00:15 2010 +0000

    Removed an unnecessary data dependency from my last patch.
    
    Reviewed by Darin Adler.
    
    * runtime/SmallStrings.cpp:
    (JSC::SmallStrings::markChildren): Since isAnyStringMarked being false
    is a condition of entering the loop, we can just use '=' instead of '|='.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54732 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 4257344..bd100b7 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-02-12  Geoffrey Garen  <ggaren at apple.com>
+
+        Reviewed by Darin Adler.
+
+        Removed an unnecessary data dependency from my last patch.
+
+        * runtime/SmallStrings.cpp:
+        (JSC::SmallStrings::markChildren): Since isAnyStringMarked being false
+        is a condition of entering the loop, we can just use '=' instead of '|='.
+
 2010-02-12  Janne Koskinen  <janne.p.koskinen at digia.com>
 
         Reviewed by Tor Arne Vestbø.
diff --git a/JavaScriptCore/runtime/SmallStrings.cpp b/JavaScriptCore/runtime/SmallStrings.cpp
index d9d4377..78bd4e4 100644
--- a/JavaScriptCore/runtime/SmallStrings.cpp
+++ b/JavaScriptCore/runtime/SmallStrings.cpp
@@ -83,7 +83,7 @@ void SmallStrings::markChildren(MarkStack& markStack)
 
     bool isAnyStringMarked = isMarked(m_emptyString);
     for (unsigned i = 0; i < numCharactersToStore && !isAnyStringMarked; ++i)
-        isAnyStringMarked |= isMarked(m_singleCharacterStrings[i]);
+        isAnyStringMarked = isMarked(m_singleCharacterStrings[i]);
     
     if (!isAnyStringMarked) {
         clear();

-- 
WebKit Debian packaging