Bug 1296516: Indentation nits in nsFrameManager. r=heycam
authorEmilio Cobos Álvarez <emilio@crisal.io>
Sun, 19 Mar 2017 12:11:34 +0100
changeset 501779 639016661f58bd44670d86a1039677f30fab8724
parent 501778 9b7c568cd42ff8d927d948ffe505c93afb6d5244
child 501780 60b20bf287b3316d4bf501d91572842822c96dec
push id50127
push userna-g@nostrum.com
push dateTue, 21 Mar 2017 00:09:45 +0000
reviewersheycam
bugs1296516
milestone55.0a1
Bug 1296516: Indentation nits in nsFrameManager. r=heycam MozReview-Commit-ID: L98VVegeATX
layout/base/nsFrameManager.h
--- a/layout/base/nsFrameManager.h
+++ b/layout/base/nsFrameManager.h
@@ -28,21 +28,22 @@
 class nsContainerFrame;
 class nsPlaceholderFrame;
 
 namespace mozilla {
 /**
  * Node in a linked list, containing the style for an element that
  * does not have a frame but whose parent does have a frame.
  */
-struct UndisplayedNode {
+struct UndisplayedNode
+{
   UndisplayedNode(nsIContent* aContent, nsStyleContext* aStyle)
-    : mContent(aContent),
-      mStyle(aStyle),
-      mNext(nullptr)
+    : mContent(aContent)
+    , mStyle(aStyle)
+    , mNext(nullptr)
   {
     MOZ_COUNT_CTOR(mozilla::UndisplayedNode);
   }
 
   ~UndisplayedNode()
   {
     MOZ_COUNT_DTOR(mozilla::UndisplayedNode);
 
@@ -51,19 +52,19 @@ struct UndisplayedNode {
     while (cur) {
       UndisplayedNode* next = cur->mNext;
       cur->mNext = nullptr;
       delete cur;
       cur = next;
     }
   }
 
-  nsCOMPtr<nsIContent>      mContent;
-  RefPtr<nsStyleContext>  mStyle;
-  UndisplayedNode*          mNext;
+  nsCOMPtr<nsIContent> mContent;
+  RefPtr<nsStyleContext> mStyle;
+  UndisplayedNode* mNext;
 };
 
 } // namespace mozilla
 
 /**
  * Frame manager interface. The frame manager serves two purposes:
  * <li>provides a service for mapping from content to frame and from
  * out-of-flow frame to placeholder frame.
@@ -94,17 +95,17 @@ public:
    */
   void Destroy();
 
   // Placeholder frame functions
   nsPlaceholderFrame* GetPlaceholderFrameFor(const nsIFrame* aFrame);
   void RegisterPlaceholderFrame(nsPlaceholderFrame* aPlaceholderFrame);
   void UnregisterPlaceholderFrame(nsPlaceholderFrame* aPlaceholderFrame);
 
-  void      ClearPlaceholderFrameMap();
+  void ClearPlaceholderFrameMap();
 
   // Mapping undisplayed content
   nsStyleContext* GetUndisplayedContent(const nsIContent* aContent)
   {
     if (!mUndisplayedMap) {
       return nullptr;
     }
     return GetStyleContextInMap(mUndisplayedMap, aContent);
@@ -151,78 +152,72 @@ public:
       return nullptr;
     }
     return GetUndisplayedNodeInMapFor(mDisplayContentsMap, aContent);
   }
 
   /**
    * Register aContent having a display:contents style context.
    */
-  void SetDisplayContents(nsIContent* aContent,
-                          nsStyleContext* aStyleContext);
+  void SetDisplayContents(nsIContent* aContent, nsStyleContext* aStyleContext);
   /**
    * Change the registered style context for aContent to aStyleContext.
    */
   void ChangeDisplayContents(nsIContent* aContent,
                              nsStyleContext* aStyleContext)
   {
     ChangeStyleContextInMap(mDisplayContentsMap, aContent, aStyleContext);
   }
 
   /**
    * Unregister the display:contents style context for aContent, if any.
    * If found, then also unregister any display:contents and display:none
    * style contexts for its descendants.
    */
-  void ClearDisplayContentsIn(nsIContent* aContent,
-                              nsIContent* aParentContent);
+  void ClearDisplayContentsIn(nsIContent* aContent, nsIContent* aParentContent);
   void ClearAllDisplayContentsIn(nsIContent* aParentContent);
 
   // Functions for manipulating the frame model
   void AppendFrames(nsContainerFrame* aParentFrame,
-                    ChildListID       aListID,
-                    nsFrameList&      aFrameList);
+                    ChildListID aListID,
+                    nsFrameList& aFrameList);
 
   void InsertFrames(nsContainerFrame* aParentFrame,
-                    ChildListID       aListID,
-                    nsIFrame*         aPrevFrame,
-                    nsFrameList&      aFrameList);
+                    ChildListID aListID,
+                    nsIFrame* aPrevFrame,
+                    nsFrameList& aFrameList);
 
-  void RemoveFrame(ChildListID     aListID,
-                   nsIFrame*       aOldFrame);
+  void RemoveFrame(ChildListID aListID, nsIFrame* aOldFrame);
 
   /*
    * Notification that a frame is about to be destroyed. This allows any
    * outstanding references to the frame to be cleaned up.
    */
-  void     NotifyDestroyingFrame(nsIFrame* aFrame);
+  void NotifyDestroyingFrame(nsIFrame* aFrame);
 
   /*
    * Capture/restore frame state for the frame subtree rooted at aFrame.
    * aState is the document state storage object onto which each frame
    * stores its state.  Callers of CaptureFrameState are responsible for
    * traversing next continuations of special siblings of aFrame as
    * needed; this method will only work with actual frametree descendants
    * of aFrame.
    */
 
-  void CaptureFrameState(nsIFrame*              aFrame,
-                                     nsILayoutHistoryState* aState);
+  void CaptureFrameState(nsIFrame* aFrame, nsILayoutHistoryState* aState);
 
-  void RestoreFrameState(nsIFrame*              aFrame,
-                                     nsILayoutHistoryState* aState);
+  void RestoreFrameState(nsIFrame* aFrame, nsILayoutHistoryState* aState);
 
   /*
    * Add/restore state for one frame
    */
-  void CaptureFrameStateFor(nsIFrame*              aFrame,
-                                        nsILayoutHistoryState* aState);
+  void CaptureFrameStateFor(nsIFrame* aFrame, nsILayoutHistoryState* aState);
 
-  void RestoreFrameStateFor(nsIFrame*              aFrame,
-                                        nsILayoutHistoryState* aState);
+  void RestoreFrameStateFor(nsIFrame* aFrame, nsILayoutHistoryState* aState);
+
 protected:
   static nsStyleContext* GetStyleContextInMap(UndisplayedMap* aMap,
                                               const nsIContent* aContent);
   static mozilla::UndisplayedNode*
     GetUndisplayedNodeInMapFor(UndisplayedMap* aMap,
                                const nsIContent* aContent);
   static mozilla::UndisplayedNode*
     GetAllUndisplayedNodesInMapFor(UndisplayedMap* aMap,