Changeset 61992 in webkit


Ignore:
Timestamp:
Jun 28, 2010 3:30:26 AM (14 years ago)
Author:
Csaba Osztrogonác
Message:

2010-06-28 Csaba Osztrogonác <Csaba Osztrogonác>

Reviewed by Kent Tamura.

GCC suggest parentheses around && within

https://bugs.webkit.org/show_bug.cgi?id=41245

  • rendering/RenderBlock.cpp: (WebCore::RenderBlock::paintChildren):
Location:
trunk/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r61990 r61992  
     12010-06-28  Csaba Osztrogonác  <ossy@webkit.org>
     2
     3        Reviewed by Kent Tamura.
     4
     5        GCC suggest parentheses around && within ||
     6        https://bugs.webkit.org/show_bug.cgi?id=41245
     7
     8        * rendering/RenderBlock.cpp:
     9        (WebCore::RenderBlock::paintChildren):
     10
    1112010-06-28  Adam Barth  <abarth@webkit.org>
    212
  • trunk/WebCore/rendering/RenderBlock.cpp

    r61065 r61992  
    21062106    for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBox()) {       
    21072107        // Check for page-break-before: always, and if it's set, break and bail.
    2108         bool checkBeforeAlways = !childrenInline() && (checkPageBreaks && child->style()->pageBreakBefore() == PBALWAYS || checkColumnBreaks && child->style()->columnBreakBefore() == PBALWAYS);
     2108        bool checkBeforeAlways = !childrenInline() && ((checkPageBreaks && child->style()->pageBreakBefore() == PBALWAYS) || (checkColumnBreaks && child->style()->columnBreakBefore() == PBALWAYS));
    21092109        if (checkBeforeAlways
    21102110            && (ty + child->y()) > paintInfo.rect.y()
     
    21152115
    21162116        // Check for page-break-inside: avoid, and it it's set, break and bail.
    2117         bool checkInsideAvoid = !childrenInline() && (checkPageBreaks && child->style()->pageBreakInside() == PBAVOID || checkColumnBreaks && child->style()->columnBreakInside() == PBAVOID);
     2117        bool checkInsideAvoid = !childrenInline() && ((checkPageBreaks && child->style()->pageBreakInside() == PBAVOID) || (checkColumnBreaks && child->style()->columnBreakInside() == PBAVOID));
    21182118        if (checkInsideAvoid
    21192119            && ty + child->y() > paintInfo.rect.y()
     
    21282128
    21292129        // Check for page-break-after: always, and if it's set, break and bail.
    2130         bool checkAfterAlways = !childrenInline() && (checkPageBreaks && child->style()->pageBreakAfter() == PBALWAYS || checkColumnBreaks && child->style()->columnBreakAfter() == PBALWAYS);
     2130        bool checkAfterAlways = !childrenInline() && ((checkPageBreaks && child->style()->pageBreakAfter() == PBALWAYS) || (checkColumnBreaks && child->style()->columnBreakAfter() == PBALWAYS));
    21312131        if (checkAfterAlways
    21322132            && (ty + child->y() + child->height()) > paintInfo.rect.y()
Note: See TracChangeset for help on using the changeset viewer.