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

[jamesr at google.com]

The following commit has been merged in the debian/experimental branch:
commit e10c58d2252495140c6da40daae73f6e49ec3386
Author: jamesr at google.com <jamesr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 30 23:17:48 2010 +0000

    2010-11-30  James Robinson  <jamesr at chromium.org>
    
            Reviewed by Tony Chang.
    
            Build fix - add parens in foo || bar && baz to make gcc happy
            https://bugs.webkit.org/show_bug.cgi?id=50276
    
            gcc 4.4 warns that statements of the form "foo || bar && baz".  It wants
            parens around the "bar && baz" part to make it clear which way the logical
            operators bind.
    
            * editing/TextIterator.cpp:
            (WebCore::SearchBuffer::search):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72968 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e79174a..894910a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-11-30  James Robinson  <jamesr at chromium.org>
+
+        Reviewed by Tony Chang.
+
+        Build fix - add parens in foo || bar && baz to make gcc happy
+        https://bugs.webkit.org/show_bug.cgi?id=50276
+
+        gcc 4.4 warns that statements of the form "foo || bar && baz".  It wants
+        parens around the "bar && baz" part to make it clear which way the logical
+        operators bind.
+
+        * editing/TextIterator.cpp:
+        (WebCore::SearchBuffer::search):
+
 2010-11-30  Daniel Bates  <dbates at rim.com>
 
         Reviewed by David Hyatt.
diff --git a/WebCore/editing/TextIterator.cpp b/WebCore/editing/TextIterator.cpp
index 1bc558a..8313c9b 100644
--- a/WebCore/editing/TextIterator.cpp
+++ b/WebCore/editing/TextIterator.cpp
@@ -2142,7 +2142,7 @@ nextMatch:
     ASSERT(matchStart + matchedLength <= size);
 
     // If this match is "bad", move on to the next match.
-    if (isBadMatch(m_buffer.data() + matchStart, matchedLength) || m_options & AtWordStarts && !isWordStartMatch(matchStart, matchedLength)) {
+    if (isBadMatch(m_buffer.data() + matchStart, matchedLength) || ((m_options & AtWordStarts) && !isWordStartMatch(matchStart, matchedLength))) {
         matchStart = usearch_next(searcher, &status);
         ASSERT(status == U_ZERO_ERROR);
         goto nextMatch;

-- 
WebKit Debian packaging