Changeset 61992 in webkit
- Timestamp:
- Jun 28, 2010 3:30:26 AM (14 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r61990 r61992 1 2010-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 1 11 2010-06-28 Adam Barth <abarth@webkit.org> 2 12 -
trunk/WebCore/rendering/RenderBlock.cpp
r61065 r61992 2106 2106 for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBox()) { 2107 2107 // 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)); 2109 2109 if (checkBeforeAlways 2110 2110 && (ty + child->y()) > paintInfo.rect.y() … … 2115 2115 2116 2116 // 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)); 2118 2118 if (checkInsideAvoid 2119 2119 && ty + child->y() > paintInfo.rect.y() … … 2128 2128 2129 2129 // 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)); 2131 2131 if (checkAfterAlways 2132 2132 && (ty + child->y() + child->height()) > paintInfo.rect.y()
Note: See TracChangeset
for help on using the changeset viewer.