Add inline accessors for frame manager. b=208190 r+sr=roc

layout/base/nsIPresShell.h

@@ -160,6 +160,9 @@ public:
   NS_IMETHOD GetStyleSet(nsIStyleSet** aResult) = 0;
   nsIStyleSet* GetStyleSet() { return mStyleSet; }
 
+  NS_IMETHOD GetFrameManager(nsIFrameManager** aFrameManager) const = 0;
+  nsIFrameManager* GetFrameManager() { return mFrameManager; }
+
   NS_IMETHOD GetActiveAlternateStyleSheet(nsString& aSheetTitle) = 0;
 
   NS_IMETHOD SelectAlternateStyleSheet(const nsString& aSheetTitle) = 0;
@@ -401,11 +404,6 @@ public:
    */
   NS_IMETHOD NotifyDestroyingFrame(nsIFrame* aFrame) = 0;
 
-  /**
-   * Returns the frame manager object
-   */
-  NS_IMETHOD GetFrameManager(nsIFrameManager** aFrameManager) const = 0;
-
   /**
    * Notify the Clipboard that we have something to copy.
    */
@@ -622,6 +620,7 @@ protected:
   nsIPresContext*           mPresContext;   // [STRONG]
   nsIStyleSet*              mStyleSet;      // [STRONG]
   nsIViewManager*           mViewManager;   // [WEAK] docViewer owns it so I don't have to
+  nsIFrameManager*          mFrameManager;  // [STRONG]
 };
 
 /**

layout/base/nsPresContext.h

@@ -59,6 +59,7 @@ class nsIDocument;
 class nsIDeviceContext;
 class nsIFontMetrics;
 class nsIFrame;
+class nsIFrameManager;
 class nsIImage;
 class nsILinkHandler;
 class nsIPresShell;
@@ -137,6 +138,8 @@ public:
   nsIDocument* GetDocument() { return GetPresShell()->GetDocument(); } 
   nsIViewManager* GetViewManager() { return GetPresShell()->GetViewManager(); } 
   nsIStyleSet* GetStyleSet() { return GetPresShell()->GetStyleSet(); } 
+  nsIFrameManager* GetFrameManager()
+    { return GetPresShell()->GetFrameManager(); } 
 
   /**
    * Access compatibility mode for this context

layout/base/nsPresShell.cpp

@@ -1320,7 +1320,6 @@ protected:
   PRInt16                       mSelectionFlags;
   PRPackedBool                  mScrollingEnabled; //used to disable programmable scrolling from outside
   PRPackedBool                  mBatchReflows;  // When set to true, the pres shell batches reflow commands.  
-  nsIFrameManager*              mFrameManager;  // we hold a reference
   PresShellViewEventListener    *mViewEventListener;
   nsCOMPtr<nsIEventQueueService> mEventQueueService;
   nsCOMPtr<nsIEventQueue>       mReflowEventQueue;

layout/base/public/nsIPresContext.h

@@ -59,6 +59,7 @@ class nsIDocument;
 class nsIDeviceContext;
 class nsIFontMetrics;
 class nsIFrame;
+class nsIFrameManager;
 class nsIImage;
 class nsILinkHandler;
 class nsIPresShell;
@@ -137,6 +138,8 @@ public:
   nsIDocument* GetDocument() { return GetPresShell()->GetDocument(); } 
   nsIViewManager* GetViewManager() { return GetPresShell()->GetViewManager(); } 
   nsIStyleSet* GetStyleSet() { return GetPresShell()->GetStyleSet(); } 
+  nsIFrameManager* GetFrameManager()
+    { return GetPresShell()->GetFrameManager(); } 
 
   /**
    * Access compatibility mode for this context

layout/base/public/nsIPresShell.h

@@ -160,6 +160,9 @@ public:
   NS_IMETHOD GetStyleSet(nsIStyleSet** aResult) = 0;
   nsIStyleSet* GetStyleSet() { return mStyleSet; }
 
+  NS_IMETHOD GetFrameManager(nsIFrameManager** aFrameManager) const = 0;
+  nsIFrameManager* GetFrameManager() { return mFrameManager; }
+
   NS_IMETHOD GetActiveAlternateStyleSheet(nsString& aSheetTitle) = 0;
 
   NS_IMETHOD SelectAlternateStyleSheet(const nsString& aSheetTitle) = 0;
@@ -401,11 +404,6 @@ public:
    */
   NS_IMETHOD NotifyDestroyingFrame(nsIFrame* aFrame) = 0;
 
-  /**
-   * Returns the frame manager object
-   */
-  NS_IMETHOD GetFrameManager(nsIFrameManager** aFrameManager) const = 0;
-
   /**
    * Notify the Clipboard that we have something to copy.
    */
@@ -622,6 +620,7 @@ protected:
   nsIPresContext*           mPresContext;   // [STRONG]
   nsIStyleSet*              mStyleSet;      // [STRONG]
   nsIViewManager*           mViewManager;   // [WEAK] docViewer owns it so I don't have to
+  nsIFrameManager*          mFrameManager;  // [STRONG]
 };
 
 /**

layout/base/public/nsPresContext.h

@@ -59,6 +59,7 @@ class nsIDocument;
 class nsIDeviceContext;
 class nsIFontMetrics;
 class nsIFrame;
+class nsIFrameManager;
 class nsIImage;
 class nsILinkHandler;
 class nsIPresShell;
@@ -137,6 +138,8 @@ public:
   nsIDocument* GetDocument() { return GetPresShell()->GetDocument(); } 
   nsIViewManager* GetViewManager() { return GetPresShell()->GetViewManager(); } 
   nsIStyleSet* GetStyleSet() { return GetPresShell()->GetStyleSet(); } 
+  nsIFrameManager* GetFrameManager()
+    { return GetPresShell()->GetFrameManager(); } 
 
   /**
    * Access compatibility mode for this context

layout/html/base/src/nsPresShell.cpp

@@ -1320,7 +1320,6 @@ protected:
   PRInt16                       mSelectionFlags;
   PRPackedBool                  mScrollingEnabled; //used to disable programmable scrolling from outside
   PRPackedBool                  mBatchReflows;  // When set to true, the pres shell batches reflow commands.  
-  nsIFrameManager*              mFrameManager;  // we hold a reference
   PresShellViewEventListener    *mViewEventListener;
   nsCOMPtr<nsIEventQueueService> mEventQueueService;
   nsCOMPtr<nsIEventQueue>       mReflowEventQueue;