From b6c07f4fe738ff400e68e78d22543b46208d01cb Mon Sep 17 00:00:00 2001 From: Phil Ringnalda Date: Fri, 26 Oct 2012 19:05:18 -0700 Subject: [PATCH] Back out c25bc74b7fd3 (bug 798033) for build bustage --- content/canvas/src/CanvasUtils.cpp | 2 -- content/canvas/src/CanvasUtils.h | 5 +++-- content/media/gstreamer/nsGStreamerReader.h | 1 + content/media/nsAudioAvailableEventManager.h | 3 ++- content/media/nsBuiltinDecoderStateMachine.h | 6 +++--- content/media/ogg/nsOggReader.h | 1 + content/media/raw/nsRawReader.cpp | 2 -- content/media/raw/nsRawReader.h | 2 +- content/xul/document/src/nsXULPrototypeCache.h | 5 +++-- 9 files changed, 14 insertions(+), 13 deletions(-) diff --git a/content/canvas/src/CanvasUtils.cpp b/content/canvas/src/CanvasUtils.cpp index c295e8b66db..bbdddd257da 100644 --- a/content/canvas/src/CanvasUtils.cpp +++ b/content/canvas/src/CanvasUtils.cpp @@ -23,8 +23,6 @@ #include "CanvasUtils.h" #include "mozilla/gfx/Matrix.h" -using namespace mozilla::gfx; - namespace mozilla { namespace CanvasUtils { diff --git a/content/canvas/src/CanvasUtils.h b/content/canvas/src/CanvasUtils.h index 9b3603d8ff2..d464d0b5478 100644 --- a/content/canvas/src/CanvasUtils.h +++ b/content/canvas/src/CanvasUtils.h @@ -21,6 +21,7 @@ class Matrix; namespace CanvasUtils { +using namespace gfx; // Check that the rectangle [x,y,w,h] is a subrectangle of [0,0,realWidth,realHeight] @@ -54,11 +55,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, - gfx::Matrix* matrix, nsresult* rv); + Matrix* matrix, nsresult* rv); nsresult MatrixToJSVal(const gfxMatrix& matrix, JSContext* cx, jsval* val); -nsresult MatrixToJSVal(const gfx::Matrix& matrix, +nsresult MatrixToJSVal(const Matrix& matrix, JSContext* cx, jsval* val); /* Float validation stuff */ diff --git a/content/media/gstreamer/nsGStreamerReader.h b/content/media/gstreamer/nsGStreamerReader.h index b7a929ff676..3590fc06f9a 100644 --- a/content/media/gstreamer/nsGStreamerReader.h +++ b/content/media/gstreamer/nsGStreamerReader.h @@ -11,6 +11,7 @@ #include #include "nsBuiltinDecoderReader.h" +using namespace mozilla; class nsMediaDecoder; class nsTimeRanges; diff --git a/content/media/nsAudioAvailableEventManager.h b/content/media/nsAudioAvailableEventManager.h index 79178180c79..d6f5c8524ed 100644 --- a/content/media/nsAudioAvailableEventManager.h +++ b/content/media/nsAudioAvailableEventManager.h @@ -12,6 +12,7 @@ #include "nsBuiltinDecoder.h" #include "nsBuiltinDecoderReader.h" +using namespace mozilla; class nsAudioAvailableEventManager { @@ -78,7 +79,7 @@ private: // ReentrantMonitor for shared access to mPendingEvents queue or // buffer length. - mozilla::ReentrantMonitor mReentrantMonitor; + 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 diff --git a/content/media/nsBuiltinDecoderStateMachine.h b/content/media/nsBuiltinDecoderStateMachine.h index c6e31d2ac15..60606ab3330 100644 --- a/content/media/nsBuiltinDecoderStateMachine.h +++ b/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) - mozilla::MutexAutoLock lock(mMutex); + MutexAutoLock lock(mMutex); if (!mStateMachine) return NS_OK; stateMachine = mStateMachine; @@ -285,11 +285,11 @@ protected: } void Revoke() { - mozilla::MutexAutoLock lock(mMutex); + MutexAutoLock lock(mMutex); mStateMachine = nullptr; } - mozilla::Mutex mMutex; + 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 diff --git a/content/media/ogg/nsOggReader.h b/content/media/ogg/nsOggReader.h index 71504547560..c47c94e5577 100644 --- a/content/media/ogg/nsOggReader.h +++ b/content/media/ogg/nsOggReader.h @@ -17,6 +17,7 @@ #include "nsOggCodecState.h" #include "VideoUtils.h" +using namespace mozilla; class nsMediaDecoder; class nsTimeRanges; diff --git a/content/media/raw/nsRawReader.cpp b/content/media/raw/nsRawReader.cpp index 7033fb77e99..5807ffd3a49 100644 --- a/content/media/raw/nsRawReader.cpp +++ b/content/media/raw/nsRawReader.cpp @@ -9,8 +9,6 @@ #include "nsRawDecoder.h" #include "VideoUtils.h" -using namespace mozilla; - nsRawReader::nsRawReader(nsBuiltinDecoder* aDecoder) : nsBuiltinDecoderReader(aDecoder), mCurrentFrame(0), mFrameSize(0) diff --git a/content/media/raw/nsRawReader.h b/content/media/raw/nsRawReader.h index 254fa12eefc..aef2d901ab5 100644 --- a/content/media/raw/nsRawReader.h +++ b/content/media/raw/nsRawReader.h @@ -43,7 +43,7 @@ public: } private: - bool ReadFromResource(mozilla::MediaResource *aResource, uint8_t *aBuf, uint32_t aLength); + bool ReadFromResource(MediaResource *aResource, uint8_t *aBuf, uint32_t aLength); nsRawVideoHeader mMetadata; uint32_t mCurrentFrame; diff --git a/content/xul/document/src/nsXULPrototypeCache.h b/content/xul/document/src/nsXULPrototypeCache.h index 7d73b98deee..e91a181182b 100644 --- a/content/xul/document/src/nsXULPrototypeCache.h +++ b/content/xul/document/src/nsXULPrototypeCache.h @@ -21,6 +21,7 @@ #include "mozilla/scache/StartupCache.h" +using namespace mozilla::scache; class nsCSSStyleSheet; @@ -111,7 +112,7 @@ public: nsresult FinishOutputStream(nsIURI* aURI); nsresult HasData(nsIURI* aURI, bool* exists); - static mozilla::scache::StartupCache* GetStartupCache(); + static StartupCache* GetStartupCache(); static nsXULPrototypeCache* GetInstance(); @@ -143,7 +144,7 @@ protected: // this is really a hash set, with a dummy data parameter nsDataHashtable mCacheURITable; - static mozilla::scache::StartupCache* gStartupCache; + static StartupCache* gStartupCache; nsInterfaceHashtable mOutputStreamTable; nsInterfaceHashtable mInputStreamTable;