Bug 1321387 part 3: Add "mozilla::" namespace prefix to some types in header files. r=TYLin
authorDaniel Holbert <dholbert@cs.stanford.edu>
Wed, 30 Nov 2016 14:50:22 -0800
changeset 324906 ba9d56ef7f5a3012572ef75abf4d33958dff7b3d
parent 324905 7fd228039333a922c879951a2e5793589b7b6005
child 324907 ad0a04a3a86936fe5c67db761fb38a1b0c48bf12
push id24
push usermaklebus@msu.edu
push dateTue, 20 Dec 2016 03:11:33 +0000
reviewersTYLin
bugs1321387
milestone53.0a1
Bug 1321387 part 3: Add "mozilla::" namespace prefix to some types in header files. r=TYLin (The only reason this isn't triggering a compile error is due to .cpp files' "using namespace mozilla" getting haphazardly shared via unified builds.) MozReview-Commit-ID: 1zhJueMWOav
layout/generic/MathMLTextRunFactory.h
layout/generic/ScrollSnap.h
layout/generic/nsTextRunTransformations.h
--- a/layout/generic/MathMLTextRunFactory.h
+++ b/layout/generic/MathMLTextRunFactory.h
@@ -9,17 +9,17 @@
 #include "mozilla/UniquePtr.h"
 #include "nsTextRunTransformations.h"
 
 /**
  * Builds textruns that render their text with MathML specific renderings.
  */
 class MathMLTextRunFactory : public nsTransformingTextRunFactory {
 public:
-  MathMLTextRunFactory(UniquePtr<nsTransformingTextRunFactory> aInnerTransformingTextRunFactory,
+  MathMLTextRunFactory(mozilla::UniquePtr<nsTransformingTextRunFactory> aInnerTransformingTextRunFactory,
                        uint32_t aFlags, uint8_t aSSTYScriptLevel,
                        float aFontInflation)
     : mInnerTransformingTextRunFactory(Move(aInnerTransformingTextRunFactory)),
       mFlags(aFlags),
       mFontInflation(aFontInflation),
       mSSTYScriptLevel(aSSTYScriptLevel) {}
 
   virtual void RebuildTextRun(nsTransformedTextRun* aTextRun,
@@ -28,15 +28,15 @@ public:
   enum {
     // Style effects which may override single character <mi> behaviour
     MATH_FONT_STYLING_NORMAL   = 0x1, // fontstyle="normal" has been set.
     MATH_FONT_WEIGHT_BOLD      = 0x2, // fontweight="bold" has been set.
     MATH_FONT_FEATURE_DTLS     = 0x4, // font feature dtls should be set
   };
 
 protected:
-  UniquePtr<nsTransformingTextRunFactory> mInnerTransformingTextRunFactory;
+  mozilla::UniquePtr<nsTransformingTextRunFactory> mInnerTransformingTextRunFactory;
   uint32_t mFlags;
   float mFontInflation;
   uint8_t mSSTYScriptLevel;
 };
 
 #endif /*MATHMLTEXTRUNFACTORY_H_*/
--- a/layout/generic/ScrollSnap.h
+++ b/layout/generic/ScrollSnap.h
@@ -22,17 +22,17 @@ struct ScrollSnapUtils {
    * of the scroll frame for which snapping is being performed.
    * If a suitable snap point could be found, it is returned. Otherwise, an
    * empty Maybe is returned.
    * IMPORTANT NOTE: This function is designed to be called both on and off
    *                 the main thread. If modifying its implementation, be sure
    *                 not to touch main-thread-only data structures without
    *                 appropriate locking.
    */
-  static Maybe<nsPoint> GetSnapPointForDestination(
+  static mozilla::Maybe<nsPoint> GetSnapPointForDestination(
       const layers::ScrollSnapInfo& aSnapInfo,
       nsIScrollableFrame::ScrollUnit aUnit,
       const nsSize& aScrollPortSize,
       const nsRect& aScrollRange,
       const nsPoint& aStartPos,
       const nsPoint& aDestination);
 };
 
--- a/layout/generic/nsTextRunTransformations.h
+++ b/layout/generic/nsTextRunTransformations.h
@@ -73,17 +73,17 @@ class nsCaseTransformTextRunFactory : pu
 public:
   // We could add an optimization here so that when there is no inner
   // factory, no title-case conversion, and no upper-casing of SZLIG, we override
   // MakeTextRun (after making it virtual in the superclass) and have it
   // just convert the string to uppercase or lowercase and create the textrun
   // via the fontgroup.
   
   // Takes ownership of aInnerTransformTextRunFactory
-  explicit nsCaseTransformTextRunFactory(UniquePtr<nsTransformingTextRunFactory> aInnerTransformingTextRunFactory,
+  explicit nsCaseTransformTextRunFactory(mozilla::UniquePtr<nsTransformingTextRunFactory> aInnerTransformingTextRunFactory,
                                          bool aAllUppercase = false)
     : mInnerTransformingTextRunFactory(Move(aInnerTransformingTextRunFactory)),
       mAllUppercase(aAllUppercase) {}
 
   virtual void RebuildTextRun(nsTransformedTextRun* aTextRun,
                               mozilla::gfx::DrawTarget* aRefDrawTarget,
                               gfxMissingFontRecorder* aMFR) override;