Bug 1379334 - Convert mis-indented code to 2-space indent, plus bracing and logical operator position fixes when reindenting. r=dholbert

MozReview-Commit-ID: ElsSNF40LZQ

layout/generic/nsGfxScrollFrame.cpp

@@ -5122,8 +5122,8 @@ nsXULScrollFrame::XULLayout(nsBoxLayoutState& aState)
     nsRect scrolledRect = mHelper.GetScrolledRect();
 
     // There are two cases to consider
-      if (scrolledRect.height <= mHelper.mScrollPort.height
-          || styles.mVertical != NS_STYLE_OVERFLOW_AUTO) {
+    if (scrolledRect.height <= mHelper.mScrollPort.height ||
+        styles.mVertical != NS_STYLE_OVERFLOW_AUTO) {
       if (mHelper.mHasVerticalScrollbar) {
         // We left room for the vertical scrollbar, but it's not needed;
         // remove it.
@@ -5134,10 +5134,11 @@ nsXULScrollFrame::XULLayout(nsBoxLayoutState& aState)
       if (!mHelper.mHasVerticalScrollbar) {
         // We didn't leave room for the vertical scrollbar, but it turns
         // out we needed it
-          if (AddVerticalScrollbar(aState, scrollbarRight))
+        if (AddVerticalScrollbar(aState, scrollbarRight)) {
           needsLayout = true;
         }
       }
+    }
 
     // ok layout at the right size
     if (needsLayout) {
@@ -5161,8 +5162,9 @@ nsXULScrollFrame::XULLayout(nsBoxLayoutState& aState)
 
       if (!mHelper.mHasHorizontalScrollbar) {
         // no scrollbar?
-          if (AddHorizontalScrollbar(aState, scrollbarBottom))
+        if (AddHorizontalScrollbar(aState, scrollbarBottom)) {
           needsLayout = true;
+        }
 
         // if we added a horizontal scrollbar and we did not have a vertical
         // there is a chance that by adding the horizontal scrollbar we will