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

[darin at apple.com]

The following commit has been merged in the debian/experimental branch:
commit d20c12544b5968dc0edf8f8b9d4fe302e3257e4b
Author: darin at apple.com <darin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 14 23:56:15 2010 +0000

    Fix warning seen with newer gcc (on Qt buildbot).
    
    Reviewed by Gavin Barraclough.
    
    * html/HTMLTreeBuilder.cpp:
    (WebCore::HTMLTreeBuilder::callTheAdoptionAgency):
    Add parentheses around && expression.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63374 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b4e56bc..ec013ea 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-07-14  Darin Adler  <darin at apple.com>
+
+        Reviewed by Gavin Barraclough.
+
+        Fix warning seen with newer gcc (on Qt buildbot).
+
+        * html/HTMLTreeBuilder.cpp:
+        (WebCore::HTMLTreeBuilder::callTheAdoptionAgency):
+        Add parentheses around && expression.
+
 2010-07-14  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/html/HTMLTreeBuilder.cpp b/WebCore/html/HTMLTreeBuilder.cpp
index 02e5e1b..d784a7f 100644
--- a/WebCore/html/HTMLTreeBuilder.cpp
+++ b/WebCore/html/HTMLTreeBuilder.cpp
@@ -1631,7 +1631,7 @@ void HTMLTreeBuilder::callTheAdoptionAgency(AtomicHTMLToken& token)
     while (1) {
         // 1.
         Element* formattingElement = m_tree.activeFormattingElements()->closestElementInScopeWithName(token.name());
-        if (!formattingElement || (m_tree.openElements()->contains(formattingElement)) && !m_tree.openElements()->inScope(formattingElement)) {
+        if (!formattingElement || ((m_tree.openElements()->contains(formattingElement)) && !m_tree.openElements()->inScope(formattingElement))) {
             parseError(token);
             notImplemented(); // Check the stack of open elements for a more specific parse error.
             return;

-- 
WebKit Debian packaging