author | Daniel Holbert <dholbert@cs.stanford.edu> |
Tue, 28 Aug 2012 11:14:52 -0700 | |
changeset 103689 | 16f3f0aab884a061d073e6fbe422500ea330356a |
parent 103688 | 8a41f262b382442039e32a1d619dfad09913ce60 |
child 103690 | 1dbf147c049a76662e3621f9ca58f2adc3cb0010 |
push id | 23368 |
push user | ryanvm@gmail.com |
push date | Wed, 29 Aug 2012 00:07:23 +0000 |
treeherder | mozilla-central@0b4bc3760d51 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | heycam |
bugs | 786031 |
milestone | 18.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/layout/generic/nsFrame.cpp +++ b/layout/generic/nsFrame.cpp @@ -836,18 +836,18 @@ const nsIFrame::ChildListID nsIFrame::kP const nsIFrame::ChildListID nsIFrame::kSelectPopupList; const nsIFrame::ChildListID nsIFrame::kNoReflowPrincipalList; #endif /* virtual */ nsMargin 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; nsMargin *m = static_cast<nsMargin*> (Properties().Get(UsedMarginProperty())); if (m) { margin = *m; } else { @@ -859,18 +859,18 @@ nsIFrame::GetUsedMargin() const } return margin; } /* virtual */ nsMargin 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; // Theme methods don't use const-ness. nsIFrame *mutable_this = const_cast<nsIFrame*>(this); const nsStyleDisplay *disp = GetStyleDisplay(); if (mutable_this->IsThemed(disp)) { @@ -895,18 +895,18 @@ nsIFrame::GetUsedBorder() const } return border; } /* virtual */ nsMargin 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; // Theme methods don't use const-ness. nsIFrame *mutable_this = const_cast<nsIFrame*>(this); const nsStyleDisplay *disp = GetStyleDisplay(); if (mutable_this->IsThemed(disp)) {