Bug 798033 - Removes 'using namespace' from /content headers - r=bsmedberg

content/canvas/src/CanvasUtils.cpp

@@ -23,6 +23,8 @@
 #include "CanvasUtils.h"
 #include "mozilla/gfx/Matrix.h"
 
+using namespace mozilla::gfx;
+
 namespace mozilla {
 namespace CanvasUtils {
 

content/canvas/src/CanvasUtils.h

@@ -21,7 +21,6 @@ class Matrix;
 
 namespace CanvasUtils {
 
-using namespace gfx;
 
 // Check that the rectangle [x,y,w,h] is a subrectangle of [0,0,realWidth,realHeight]
 
@@ -55,11 +54,11 @@ bool CoerceDouble(jsval v, double* d);
 bool JSValToMatrix(JSContext* cx, const jsval& val,
                    gfxMatrix* matrix, nsresult* rv);
 bool JSValToMatrix(JSContext* cx, const jsval& val,
-                   Matrix* matrix, nsresult* rv);
+                   gfx::Matrix* matrix, nsresult* rv);
 
 nsresult MatrixToJSVal(const gfxMatrix& matrix,
                        JSContext* cx, jsval* val);
-nsresult MatrixToJSVal(const Matrix& matrix,
+nsresult MatrixToJSVal(const gfx::Matrix& matrix,
                        JSContext* cx, jsval* val);
 
     /* Float validation stuff */

content/media/gstreamer/nsGStreamerReader.h

@@ -11,7 +11,6 @@
 #include <gst/video/video.h>
 #include "nsBuiltinDecoderReader.h"
 
-using namespace mozilla;
 
 class nsMediaDecoder;
 class nsTimeRanges;

content/media/nsAudioAvailableEventManager.h

@@ -12,7 +12,6 @@
 #include "nsBuiltinDecoder.h"
 #include "nsBuiltinDecoderReader.h"
 
-using namespace mozilla;
 
 class nsAudioAvailableEventManager
 {
@@ -30,7 +29,7 @@ public:
 
   // Queues audio sample data and re-packages it into equal sized
   // framebuffers.  Called from the audio thread.
-  void QueueWrittenAudioData(AudioDataValue* aAudioData,
+  void QueueWrittenAudioData(mozilla::AudioDataValue* aAudioData,
                              uint32_t aAudioDataLength,
                              uint64_t aEndTimeSampleOffset);
 
@@ -79,7 +78,7 @@ private:
 
   // ReentrantMonitor for shared access to mPendingEvents queue or
   // buffer length.
-  ReentrantMonitor mReentrantMonitor;
+  mozilla::ReentrantMonitor mReentrantMonitor;
 
   // True if something in the owning document has a listener on the
   // "MozAudioAvailable" event. If not, we don't need to bother copying played

content/media/nsBuiltinDecoderStateMachine.h

@@ -275,7 +275,7 @@ protected:
       {
         // Don't let Run() (called by media stream graph thread) race with
         // Revoke() (called by decoder state machine thread)
-        MutexAutoLock lock(mMutex);
+        mozilla::MutexAutoLock lock(mMutex);
         if (!mStateMachine)
           return NS_OK;
         stateMachine = mStateMachine;
@@ -285,11 +285,11 @@ protected:
     }
     void Revoke()
     {
-      MutexAutoLock lock(mMutex);
+      mozilla::MutexAutoLock lock(mMutex);
       mStateMachine = nullptr;
     }
 
-    Mutex mMutex;
+    mozilla::Mutex mMutex;
     // Protected by mMutex.
     // We don't use an owning pointer here, because keeping mStateMachine alive
     // would mean in some cases we'd have to destroy mStateMachine from this

content/media/ogg/nsOggReader.h

@@ -17,7 +17,6 @@
 #include "nsOggCodecState.h"
 #include "VideoUtils.h"
 
-using namespace mozilla;
 
 class nsMediaDecoder;
 class nsTimeRanges;

content/media/raw/nsRawReader.cpp

@@ -9,6 +9,8 @@
 #include "nsRawDecoder.h"
 #include "VideoUtils.h"
 
+using namespace mozilla;
+
 nsRawReader::nsRawReader(nsBuiltinDecoder* aDecoder)
   : nsBuiltinDecoderReader(aDecoder),
     mCurrentFrame(0), mFrameSize(0)

content/media/raw/nsRawReader.h

@@ -43,7 +43,7 @@ public:
   }
 
 private:
-  bool ReadFromResource(MediaResource *aResource, uint8_t *aBuf, uint32_t aLength);
+  bool ReadFromResource(mozilla::MediaResource *aResource, uint8_t *aBuf, uint32_t aLength);
 
   nsRawVideoHeader mMetadata;
   uint32_t mCurrentFrame;

content/xul/document/src/nsXULPrototypeCache.h

@@ -21,7 +21,6 @@
 
 #include "mozilla/scache/StartupCache.h"
 
-using namespace mozilla::scache;
 
 class nsCSSStyleSheet;
 
@@ -112,7 +111,7 @@ public:
     nsresult FinishOutputStream(nsIURI* aURI);
     nsresult HasData(nsIURI* aURI, bool* exists);
 
-    static StartupCache* GetStartupCache();
+    static mozilla::scache::StartupCache* GetStartupCache();
 
     static nsXULPrototypeCache* GetInstance();
 
@@ -144,7 +143,7 @@ protected:
     // this is really a hash set, with a dummy data parameter
     nsDataHashtable<nsURIHashKey,uint32_t> mCacheURITable;
 
-    static StartupCache* gStartupCache;
+    static mozilla::scache::StartupCache* gStartupCache;
     nsInterfaceHashtable<nsURIHashKey, nsIStorageStream> mOutputStreamTable;
     nsInterfaceHashtable<nsURIHashKey, nsIObjectInputStream> mInputStreamTable;