commit 19d8c5fcf060d95ebd322eac523f9dd3333bc0bf
author staikos@webkit.org <staikos@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Thu Mar 26 14:24:15 2009 +0000
committer staikos@webkit.org <staikos@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Thu Mar 26 14:24:15 2009 +0000
tree ebafd5734e3f4e2b7bb649e8203f71e02d9e1f75
parent 73345be612849d83f59924e390b7aa421354af01

2009-03-26  Eli Fidler  <eli.fidler@torchmobile.com>

        Reviewed by George Staikos.

        Remove warnings all over the place by making operator precedence
        explicit in cases like x && y || z.  No functional change.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@42002 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/rendering/bidi.cpp

diff --git a/WebCore/rendering/bidi.cpp b/WebCore/rendering/bidi.cpp
index 3765d13..72c99d6 100644
--- a/WebCore/rendering/bidi.cpp
+++ b/WebCore/rendering/bidi.cpp
@@ -1197,7 +1197,7 @@
             // We have a dirty line.
             if (RootInlineBox* prevRootBox = curr->prevRootBox()) {
                 // We have a previous line.
-                if (!dirtiedByFloat && (!prevRootBox->endsWithBreak() || prevRootBox->lineBreakObj()->isText() && prevRootBox->lineBreakPos() >= toRenderText(prevRootBox->lineBreakObj())->textLength()))
+                if (!dirtiedByFloat && (!prevRootBox->endsWithBreak() || (prevRootBox->lineBreakObj()->isText() && prevRootBox->lineBreakPos() >= toRenderText(prevRootBox->lineBreakObj())->textLength())))
                     // The previous line didn't break cleanly or broke at a newline
                     // that has been deleted, so treat it as dirty too.
                     curr = prevRootBox;
@@ -1557,7 +1557,7 @@
 
 static inline unsigned textWidth(RenderText* text, unsigned from, unsigned len, const Font& font, int xPos, bool isFixedPitch, bool collapseWhiteSpace)
 {
-    if (isFixedPitch || !from && len == text->textLength())
+    if (isFixedPitch || (!from && len == text->textLength()))
         return text->width(from, len, font, xPos);
     return font.width(TextRun(text->characters() + from, len, !collapseWhiteSpace, xPos));
 }