From 0c9830c1169c9fe0eaf411ec5a901ce226cfa863 Mon Sep 17 00:00:00 2001 From: Daniel Holbert Date: Tue, 28 Aug 2012 11:14:52 -0700 Subject: [PATCH] Bug 786031: Add parens around "&&" within "||" in nsFrame.cpp to fix GCC -Wparentheses build warnings. r=heycam --- layout/generic/nsFrame.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp index 93483fa508b..c65a2d7a9f3 100644 --- a/layout/generic/nsFrame.cpp +++ b/layout/generic/nsFrame.cpp @@ -841,8 +841,8 @@ const nsIFrame::ChildListID nsIFrame::kNoReflowPrincipalList; nsIFrame::GetUsedMargin() const { nsMargin margin(0, 0, 0, 0); - if ((mState & NS_FRAME_FIRST_REFLOW) && - !(mState & NS_FRAME_IN_REFLOW) || + if (((mState & NS_FRAME_FIRST_REFLOW) && + !(mState & NS_FRAME_IN_REFLOW)) || (mState & NS_FRAME_IS_SVG_TEXT)) return margin; @@ -864,8 +864,8 @@ nsIFrame::GetUsedMargin() const nsIFrame::GetUsedBorder() const { nsMargin border(0, 0, 0, 0); - if ((mState & NS_FRAME_FIRST_REFLOW) && - !(mState & NS_FRAME_IN_REFLOW) || + if (((mState & NS_FRAME_FIRST_REFLOW) && + !(mState & NS_FRAME_IN_REFLOW)) || (mState & NS_FRAME_IS_SVG_TEXT)) return border; @@ -900,8 +900,8 @@ nsIFrame::GetUsedBorder() const nsIFrame::GetUsedPadding() const { nsMargin padding(0, 0, 0, 0); - if ((mState & NS_FRAME_FIRST_REFLOW) && - !(mState & NS_FRAME_IN_REFLOW) || + if (((mState & NS_FRAME_FIRST_REFLOW) && + !(mState & NS_FRAME_IN_REFLOW)) || (mState & NS_FRAME_IS_SVG_TEXT)) return padding;