Bug 1398376 part 1: Remove MOZILLA_INTERNAL_API guards from nsIPresShell.h and nsPresContext.h, since these headers are only used in libxul. r=mats

This patch drops all MOZILLA_INTERNAL_API checks (and the bodies of any
associated "#else" clauses) from these files.  The basic assumption here is
that MOZILLA_INTERNAL_API is #defined in all (supported) compilation units that
#include these files, so the checks are superfluous and the #else clauses are
dead code.

(If this assumption is mistaken and there is some .cpp file in our codebase
that #includes this header and yet does not have MOZILLA_INTERNAL_API, we will
find out via bustage on treeherder.)

MozReview-Commit-ID: 8dHJFBDVHwT

--HG--
extra : rebase_source : 476a6e2de8468dea2e26e11f415c3868326126e5

layout/base/nsIPresShell.h

@@ -275,7 +275,6 @@ public:
   }
 #endif
 
-#ifdef MOZILLA_INTERNAL_API
   mozilla::StyleSetHandle StyleSet() const { return mStyleSet; }
 
   nsCSSFrameConstructor* FrameConstructor() const { return mFrameConstructor; }
@@ -287,8 +286,6 @@ public:
                            (const_cast<nsIPresShell*>(this)->mFrameManager);
   }
 
-#endif
-
   /* Enable/disable author style level. Disabling author style disables the entire
    * author level of the cascade, including the HTML preshint level.
    */
@@ -393,11 +390,7 @@ public:
    */
   virtual nsIFrame* GetRootFrameExternal() const;
   nsIFrame* GetRootFrame() const {
-#ifdef MOZILLA_INTERNAL_API
     return mFrameManager->GetRootFrame();
-#else
-    return GetRootFrameExternal();
-#endif
   }
 
   /*
@@ -1168,19 +1161,11 @@ public:
 
   void AddAutoWeakFrame(AutoWeakFrame* aWeakFrame)
   {
-#ifdef MOZILLA_INTERNAL_API
     AddAutoWeakFrameInternal(aWeakFrame);
-#else
-    AddAutoWeakFrameExternal(aWeakFrame);
-#endif
   }
   void AddWeakFrame(WeakFrame* aWeakFrame)
   {
-#ifdef MOZILLA_INTERNAL_API
     AddWeakFrameInternal(aWeakFrame);
-#else
-    AddWeakFrameExternal(aWeakFrame);
-#endif
   }
 
   void RemoveAutoWeakFrameInternal(AutoWeakFrame* aWeakFrame);
@@ -1190,19 +1175,11 @@ public:
 
   void RemoveAutoWeakFrame(AutoWeakFrame* aWeakFrame)
   {
-#ifdef MOZILLA_INTERNAL_API
     RemoveAutoWeakFrameInternal(aWeakFrame);
-#else
-    RemoveAutoWeakFrameExternal(aWeakFrame);
-#endif
   }
   void RemoveWeakFrame(WeakFrame* aWeakFrame)
   {
-#ifdef MOZILLA_INTERNAL_API
     RemoveWeakFrameInternal(aWeakFrame);
-#else
-    RemoveWeakFrameExternal(aWeakFrame);
-#endif
   }
 
 #ifdef DEBUG
@@ -1725,20 +1702,12 @@ protected:
 public:
   bool AddRefreshObserver(nsARefreshObserver* aObserver,
                           mozilla::FlushType aFlushType) {
-#ifdef MOZILLA_INTERNAL_API
     return AddRefreshObserverInternal(aObserver, aFlushType);
-#else
-    return AddRefreshObserverExternal(aObserver, aFlushType);
-#endif
   }
 
   bool RemoveRefreshObserver(nsARefreshObserver* aObserver,
                              mozilla::FlushType aFlushType) {
-#ifdef MOZILLA_INTERNAL_API
     return RemoveRefreshObserverInternal(aObserver, aFlushType);
-#else
-    return RemoveRefreshObserverExternal(aObserver, aFlushType);
-#endif
   }
 
   virtual bool AddPostRefreshObserver(nsAPostRefreshObserver* aObserver);

layout/base/nsPresContext.h

@@ -220,7 +220,6 @@ public:
       return mDocument;
   }
 
-#ifdef MOZILLA_INTERNAL_API
   mozilla::StyleSetHandle StyleSet() const { return GetPresShell()->StyleSet(); }
 
   nsFrameManager* FrameManager()
@@ -243,7 +242,6 @@ public:
   mozilla::CounterStyleManager* CounterStyleManager() const {
     return mCounterStyleManager;
   }
-#endif
 
   /**
    * Rebuilds all style data by throwing out the old rule tree and
@@ -321,13 +319,8 @@ public:
   uint16_t     ImageAnimationMode() const { return mImageAnimationMode; }
   virtual void SetImageAnimationModeExternal(uint16_t aMode);
   void SetImageAnimationModeInternal(uint16_t aMode);
-#ifdef MOZILLA_INTERNAL_API
   void SetImageAnimationMode(uint16_t aMode)
   { SetImageAnimationModeInternal(aMode); }
-#else
-  void SetImageAnimationMode(uint16_t aMode)
-  { SetImageAnimationModeExternal(aMode); }
-#endif
 
   /**
    * Get medium of presentation
@@ -431,13 +424,8 @@ public:
 
   virtual nsISupports* GetContainerWeakExternal() const;
   nsISupports* GetContainerWeakInternal() const;
-#ifdef MOZILLA_INTERNAL_API
   nsISupports* GetContainerWeak() const
   { return GetContainerWeakInternal(); }
-#else
-  nsISupports* GetContainerWeak() const
-  { return GetContainerWeakExternal(); }
-#endif
 
   nsIDocShell* GetDocShell() const;
 
@@ -780,11 +768,7 @@ public:
    *
    *  @lina 07/12/2000
    */
-#ifdef MOZILLA_INTERNAL_API
   bool BidiEnabled() const { return BidiEnabledInternal(); }
-#else
-  bool BidiEnabled() const { return BidiEnabledExternal(); }
-#endif
   virtual bool BidiEnabledExternal() const;
   bool BidiEnabledInternal() const;