Bug 798033 - Removes 'using namespace' from dom headers - r=khuey

This commit is contained in:
Matt Joras 2012-11-10 10:45:52 -05:00
parent 7b6c5f3e23
commit 6d89044915
33 changed files with 56 additions and 58 deletions

View File

@ -9,6 +9,7 @@
#include "CameraCommon.h"
using namespace mozilla;
using namespace mozilla::dom;
CameraControlImpl::CameraControlImpl(uint32_t aCameraId, nsIThread* aCameraThread, uint64_t aWindowId)
: mCameraId(aCameraId)

View File

@ -16,7 +16,6 @@
namespace mozilla {
using namespace dom;
class GetPreviewStreamTask;
class StartPreviewTask;
@ -48,14 +47,14 @@ class CameraControlImpl : public ICameraControl
public:
CameraControlImpl(uint32_t aCameraId, nsIThread* aCameraThread, uint64_t aWindowId);
nsresult GetPreviewStream(CameraSize aSize, nsICameraPreviewStreamCallback* onSuccess, nsICameraErrorCallback* onError);
nsresult GetPreviewStream(dom::CameraSize aSize, nsICameraPreviewStreamCallback* onSuccess, nsICameraErrorCallback* onError);
nsresult StartPreview(DOMCameraPreview* aDOMPreview);
void StopPreview();
nsresult AutoFocus(nsICameraAutoFocusCallback* onSuccess, nsICameraErrorCallback* onError);
nsresult TakePicture(CameraSize aSize, int32_t aRotation, const nsAString& aFileFormat, CameraPosition aPosition, nsICameraTakePictureCallback* onSuccess, nsICameraErrorCallback* onError);
nsresult StartRecording(CameraStartRecordingOptions* aOptions, nsIFile* aFolder, const nsAString& aFilename, nsICameraStartRecordingCallback* onSuccess, nsICameraErrorCallback* onError);
nsresult TakePicture(dom::CameraSize aSize, int32_t aRotation, const nsAString& aFileFormat, dom::CameraPosition aPosition, nsICameraTakePictureCallback* onSuccess, nsICameraErrorCallback* onError);
nsresult StartRecording(dom::CameraStartRecordingOptions* aOptions, nsIFile* aFolder, const nsAString& aFilename, nsICameraStartRecordingCallback* onSuccess, nsICameraErrorCallback* onError);
nsresult StopRecording();
nsresult GetPreviewStreamVideoMode(CameraRecorderOptions* aOptions, nsICameraPreviewStreamCallback* onSuccess, nsICameraErrorCallback* onError);
nsresult GetPreviewStreamVideoMode(dom::CameraRecorderOptions* aOptions, nsICameraPreviewStreamCallback* onSuccess, nsICameraErrorCallback* onError);
nsresult Set(uint32_t aKey, const nsAString& aValue);
nsresult Get(uint32_t aKey, nsAString& aValue);
@ -86,12 +85,12 @@ public:
virtual const char* GetParameter(const char* aKey) = 0;
virtual const char* GetParameterConstChar(uint32_t aKey) = 0;
virtual double GetParameterDouble(uint32_t aKey) = 0;
virtual void GetParameter(uint32_t aKey, nsTArray<CameraRegion>& aRegions) = 0;
virtual void GetParameter(uint32_t aKey, nsTArray<dom::CameraRegion>& aRegions) = 0;
virtual void SetParameter(const char* aKey, const char* aValue) = 0;
virtual void SetParameter(uint32_t aKey, const char* aValue) = 0;
virtual void SetParameter(uint32_t aKey, double aValue) = 0;
virtual void SetParameter(uint32_t aKey, const nsTArray<CameraRegion>& aRegions) = 0;
virtual nsresult GetVideoSizes(nsTArray<CameraSize>& aVideoSizes) = 0;
virtual void SetParameter(uint32_t aKey, const nsTArray<dom::CameraRegion>& aRegions) = 0;
virtual nsresult GetVideoSizes(nsTArray<dom::CameraSize>& aVideoSizes) = 0;
virtual nsresult PushParameters() = 0;
virtual void Shutdown();
@ -217,7 +216,7 @@ protected:
class GetPreviewStreamTask : public nsRunnable
{
public:
GetPreviewStreamTask(CameraControlImpl* aCameraControl, CameraSize aSize, nsICameraPreviewStreamCallback* onSuccess, nsICameraErrorCallback* onError)
GetPreviewStreamTask(CameraControlImpl* aCameraControl, dom::CameraSize aSize, nsICameraPreviewStreamCallback* onSuccess, nsICameraErrorCallback* onError)
: mSize(aSize)
, mCameraControl(aCameraControl)
, mOnSuccessCb(onSuccess)
@ -242,7 +241,7 @@ public:
return rv;
}
CameraSize mSize;
dom::CameraSize mSize;
nsRefPtr<CameraControlImpl> mCameraControl;
nsCOMPtr<nsICameraPreviewStreamCallback> mOnSuccessCb;
nsCOMPtr<nsICameraErrorCallback> mOnErrorCb;
@ -350,7 +349,7 @@ protected:
class TakePictureTask : public nsRunnable
{
public:
TakePictureTask(CameraControlImpl* aCameraControl, CameraSize aSize, int32_t aRotation, const nsAString& aFileFormat, CameraPosition aPosition, nsICameraTakePictureCallback* onSuccess, nsICameraErrorCallback* onError)
TakePictureTask(CameraControlImpl* aCameraControl, dom::CameraSize aSize, int32_t aRotation, const nsAString& aFileFormat, dom::CameraPosition aPosition, nsICameraTakePictureCallback* onSuccess, nsICameraErrorCallback* onError)
: mCameraControl(aCameraControl)
, mSize(aSize)
, mRotation(aRotation)
@ -381,10 +380,10 @@ public:
}
nsRefPtr<CameraControlImpl> mCameraControl;
CameraSize mSize;
dom::CameraSize mSize;
int32_t mRotation;
nsString mFileFormat;
CameraPosition mPosition;
dom::CameraPosition mPosition;
nsCOMPtr<nsICameraTakePictureCallback> mOnSuccessCb;
nsCOMPtr<nsICameraErrorCallback> mOnErrorCb;
};
@ -419,7 +418,7 @@ protected:
class StartRecordingTask : public nsRunnable
{
public:
StartRecordingTask(CameraControlImpl* aCameraControl, CameraStartRecordingOptions aOptions, nsIFile* aFolder, const nsAString& aFilename, nsICameraStartRecordingCallback* onSuccess, nsICameraErrorCallback* onError, uint64_t aWindowId)
StartRecordingTask(CameraControlImpl* aCameraControl, dom::CameraStartRecordingOptions aOptions, nsIFile* aFolder, const nsAString& aFilename, nsICameraStartRecordingCallback* onSuccess, nsICameraErrorCallback* onError, uint64_t aWindowId)
: mCameraControl(aCameraControl)
, mOptions(aOptions)
, mFolder(aFolder)
@ -457,7 +456,7 @@ public:
}
nsRefPtr<CameraControlImpl> mCameraControl;
CameraStartRecordingOptions mOptions;
dom::CameraStartRecordingOptions mOptions;
nsCOMPtr<nsIFile> mFolder;
nsString mFilename;
nsCOMPtr<nsICameraStartRecordingCallback> mOnSuccessCb;
@ -585,7 +584,7 @@ protected:
class GetPreviewStreamVideoModeTask : public nsRunnable
{
public:
GetPreviewStreamVideoModeTask(CameraControlImpl* aCameraControl, CameraRecorderOptions aOptions, nsICameraPreviewStreamCallback* onSuccess, nsICameraErrorCallback* onError)
GetPreviewStreamVideoModeTask(CameraControlImpl* aCameraControl, dom::CameraRecorderOptions aOptions, nsICameraPreviewStreamCallback* onSuccess, nsICameraErrorCallback* onError)
: mCameraControl(aCameraControl)
, mOptions(aOptions)
, mOnSuccessCb(onSuccess)
@ -606,7 +605,7 @@ public:
}
nsRefPtr<CameraControlImpl> mCameraControl;
CameraRecorderOptions mOptions;
dom::CameraRecorderOptions mOptions;
nsCOMPtr<nsICameraPreviewStreamCallback> mOnSuccessCb;
nsCOMPtr<nsICameraErrorCallback> mOnErrorCb;
};

View File

@ -12,8 +12,6 @@
#include "DictionaryHelpers.h"
#include "CameraCommon.h"
using namespace mozilla;
using namespace dom;
namespace mozilla {

View File

@ -13,6 +13,7 @@
#include "CameraCommon.h"
using namespace mozilla;
using namespace mozilla::dom;
DOMCI_DATA(CameraCapabilities, nsICameraCapabilities)

View File

@ -16,8 +16,6 @@
namespace mozilla {
using namespace mozilla;
using namespace dom;
// Main camera control.
class nsDOMCameraControl : public nsICameraControl

View File

@ -9,6 +9,7 @@
#include "CameraCommon.h"
using namespace mozilla;
using namespace mozilla::layers;
/**
* 'PreviewControl' is a helper class that dispatches preview control

View File

@ -12,12 +12,10 @@
#include "nsDOMMediaStream.h"
#include "CameraCommon.h"
using namespace mozilla;
using namespace mozilla::layers;
namespace mozilla {
typedef void (*FrameBuilder)(Image* aImage, void* aBuffer, uint32_t aWidth, uint32_t aHeight);
typedef void (*FrameBuilder)(mozilla::layers::Image* aImage, void* aBuffer, uint32_t aWidth, uint32_t aHeight);
/**
* DOMCameraPreview is only exposed to the DOM as an nsDOMMediaStream,
@ -30,7 +28,7 @@ protected:
public:
DOMCameraPreview(ICameraControl* aCameraControl, uint32_t aWidth, uint32_t aHeight, uint32_t aFramesPerSecond = 30);
bool ReceiveFrame(void* aBuffer, ImageFormat aFormat, FrameBuilder aBuilder);
bool ReceiveFrame(void* aBuffer, ImageFormat aFormat, mozilla::FrameBuilder aBuilder);
bool HaveEnoughBuffered();
NS_IMETHODIMP
@ -63,7 +61,7 @@ protected:
uint32_t mHeight;
uint32_t mFramesPerSecond;
SourceMediaStream* mInput;
nsRefPtr<ImageContainer> mImageContainer;
nsRefPtr<mozilla::layers::ImageContainer> mImageContainer;
VideoSegment mVideoSegment;
uint32_t mFrameCount;
nsRefPtr<ICameraControl> mCameraControl;

View File

@ -6,6 +6,7 @@
#include "CameraControlImpl.h"
using namespace mozilla;
using namespace mozilla::dom;
namespace mozilla {
class RecorderProfileManager;

View File

@ -26,7 +26,6 @@
#include "CameraCommon.h"
#include "GonkRecorder.h"
using namespace android;
namespace mozilla {

View File

@ -32,8 +32,6 @@
#define GIHM_TIMING_RECEIVEFRAME 0
#define GIHM_TIMING_OVERALL 1
using namespace mozilla;
using namespace android;
namespace mozilla {

View File

@ -18,7 +18,6 @@
} while(0)
#endif
using namespace android;
namespace android {
class GonkRecorder;

View File

@ -13,7 +13,6 @@
namespace mozilla {
using namespace dom;
class DOMCameraPreview;
class RecorderProfileManager;
@ -23,14 +22,14 @@ class ICameraControl
public:
NS_INLINE_DECL_THREADSAFE_REFCOUNTING(ICameraControl)
virtual nsresult GetPreviewStream(CameraSize aSize, nsICameraPreviewStreamCallback* onSuccess, nsICameraErrorCallback* onError) = 0;
virtual nsresult GetPreviewStream(dom::CameraSize aSize, nsICameraPreviewStreamCallback* onSuccess, nsICameraErrorCallback* onError) = 0;
virtual nsresult StartPreview(DOMCameraPreview* aDOMPreview) = 0;
virtual void StopPreview() = 0;
virtual nsresult AutoFocus(nsICameraAutoFocusCallback* onSuccess, nsICameraErrorCallback* onError) = 0;
virtual nsresult TakePicture(CameraSize aSize, int32_t aRotation, const nsAString& aFileFormat, CameraPosition aPosition, nsICameraTakePictureCallback* onSuccess, nsICameraErrorCallback* onError) = 0;
virtual nsresult StartRecording(CameraStartRecordingOptions* aOptions, nsIFile* aFolder, const nsAString& aFilename, nsICameraStartRecordingCallback* onSuccess, nsICameraErrorCallback* onError) = 0;
virtual nsresult TakePicture(dom::CameraSize aSize, int32_t aRotation, const nsAString& aFileFormat, dom::CameraPosition aPosition, nsICameraTakePictureCallback* onSuccess, nsICameraErrorCallback* onError) = 0;
virtual nsresult StartRecording(dom::CameraStartRecordingOptions* aOptions, nsIFile* aFolder, const nsAString& aFilename, nsICameraStartRecordingCallback* onSuccess, nsICameraErrorCallback* onError) = 0;
virtual nsresult StopRecording() = 0;
virtual nsresult GetPreviewStreamVideoMode(CameraRecorderOptions* aOptions, nsICameraPreviewStreamCallback* onSuccess, nsICameraErrorCallback* onError) = 0;
virtual nsresult GetPreviewStreamVideoMode(dom::CameraRecorderOptions* aOptions, nsICameraPreviewStreamCallback* onSuccess, nsICameraErrorCallback* onError) = 0;
virtual nsresult Set(uint32_t aKey, const nsAString& aValue) = 0;
virtual nsresult Get(uint32_t aKey, nsAString& aValue) = 0;
@ -46,18 +45,18 @@ public:
virtual nsresult Get(nsICameraRecorderStateChange** aOnRecorderStateChange) = 0;
virtual nsresult SetFocusAreas(JSContext* aCx, const JS::Value& aValue) = 0;
virtual nsresult SetMeteringAreas(JSContext* aCx, const JS::Value& aValue) = 0;
virtual nsresult GetVideoSizes(nsTArray<CameraSize>& aVideoSizes) = 0;
virtual nsresult GetVideoSizes(nsTArray<dom::CameraSize>& aVideoSizes) = 0;
virtual already_AddRefed<RecorderProfileManager> GetRecorderProfileManager() = 0;
virtual uint32_t GetCameraId() = 0;
virtual const char* GetParameter(const char* aKey) = 0;
virtual const char* GetParameterConstChar(uint32_t aKey) = 0;
virtual double GetParameterDouble(uint32_t aKey) = 0;
virtual void GetParameter(uint32_t aKey, nsTArray<CameraRegion>& aRegions) = 0;
virtual void GetParameter(uint32_t aKey, nsTArray<dom::CameraRegion>& aRegions) = 0;
virtual void SetParameter(const char* aKey, const char* aValue) = 0;
virtual void SetParameter(uint32_t aKey, const char* aValue) = 0;
virtual void SetParameter(uint32_t aKey, double aValue) = 0;
virtual void SetParameter(uint32_t aKey, const nsTArray<CameraRegion>& aRegions) = 0;
virtual void SetParameter(uint32_t aKey, const nsTArray<dom::CameraRegion>& aRegions) = 0;
virtual void Shutdown() = 0;

View File

@ -39,10 +39,6 @@ class nsPIDOMWindow;
#define POST_ERROR_EVENT_ILLEGAL_TYPE "TypeMismatchError"
#define POST_ERROR_EVENT_UNKNOWN "Unknown"
using namespace mozilla;
using namespace mozilla::dom;
using namespace mozilla::dom::devicestorage;
enum DeviceStorageRequestType {
DEVICE_STORAGE_REQUEST_READ,
DEVICE_STORAGE_REQUEST_WRITE,
@ -110,23 +106,23 @@ private:
class ContinueCursorEvent MOZ_FINAL : public nsRunnable
{
public:
ContinueCursorEvent(nsRefPtr<DOMRequest>& aRequest);
ContinueCursorEvent(DOMRequest* aRequest);
ContinueCursorEvent(nsRefPtr<mozilla::dom::DOMRequest>& aRequest);
ContinueCursorEvent(mozilla::dom::DOMRequest* aRequest);
~ContinueCursorEvent();
void Continue();
NS_IMETHOD Run();
private:
already_AddRefed<DeviceStorageFile> GetNextFile();
nsRefPtr<DOMRequest> mRequest;
nsRefPtr<mozilla::dom::DOMRequest> mRequest;
};
class nsDOMDeviceStorageCursor MOZ_FINAL
: public nsIDOMDeviceStorageCursor
, public DOMRequest
, public mozilla::dom::DOMRequest
, public nsIContentPermissionRequest
, public PCOMContentPermissionRequestChild
, public DeviceStorageRequestChildCallback
, public mozilla::dom::devicestorage::DeviceStorageRequestChildCallback
{
public:
NS_DECL_ISUPPORTS_INHERITED

View File

@ -27,6 +27,8 @@ static int gNotOptimized;
#define ALOG(args...) __android_log_print(ANDROID_LOG_INFO, "GeckoJavaEnv", ## args)
#endif
using namespace mozilla::layers;
namespace mozilla {
#ifdef MOZ_WIDGET_ANDROID
nsresult

View File

@ -109,7 +109,7 @@ public:
virtual nsresult NPP_GetSitesWithData(InfallibleTArray<nsCString>& result);
virtual nsresult AsyncSetWindow(NPP instance, NPWindow* window);
virtual nsresult GetImageContainer(NPP instance, ImageContainer** aContainer);
virtual nsresult GetImageContainer(NPP instance, mozilla::layers::ImageContainer** aContainer);
virtual nsresult GetImageSize(NPP instance, nsIntSize* aSize);
virtual bool IsOOP() MOZ_OVERRIDE { return false; }
#if defined(XP_MACOSX)

View File

@ -149,6 +149,7 @@ private:
using namespace mozilla;
using namespace mozilla::plugins::parent;
using namespace mozilla::layers;
static NS_DEFINE_IID(kIOutputStreamIID, NS_IOUTPUTSTREAM_IID);

View File

@ -83,7 +83,7 @@ public:
bool ShouldCache();
nsresult IsWindowless(bool* isWindowless);
nsresult AsyncSetWindow(NPWindow* window);
nsresult GetImageContainer(ImageContainer **aContainer);
nsresult GetImageContainer(mozilla::layers::ImageContainer **aContainer);
nsresult GetImageSize(nsIntSize* aSize);
nsresult NotifyPainted(void);
nsresult GetIsOOP(bool* aIsOOP);

View File

@ -93,6 +93,7 @@ using namespace mozilla::dom;
#endif
using namespace mozilla;
using namespace mozilla::layers;
// special class for handeling DOM context menu events because for
// some reason it starves other mouse events if implemented on the

View File

@ -213,7 +213,7 @@ public:
void NotifyPaintWaiter(nsDisplayListBuilder* aBuilder);
// Returns the image container that has our currently displayed image.
already_AddRefed<ImageContainer> GetImageContainer();
already_AddRefed<mozilla::layers::ImageContainer> GetImageContainer();
/**
* Returns the bounds of the current async-rendered surface. This can only
@ -234,7 +234,7 @@ public:
#ifdef MOZ_WIDGET_ANDROID
// Returns the image container for the specified VideoInfo
void GetVideos(nsTArray<nsNPAPIPluginInstance::VideoInfo*>& aVideos);
already_AddRefed<ImageContainer> GetImageContainerForVideo(nsNPAPIPluginInstance::VideoInfo* aVideoInfo);
already_AddRefed<mozilla::layers::ImageContainer> GetImageContainerForVideo(nsNPAPIPluginInstance::VideoInfo* aVideoInfo);
void Invalidate();

View File

@ -43,6 +43,7 @@ using mozilla::gfx::SharedDIBSurface;
using namespace mozilla;
using mozilla::ipc::ProcessChild;
using namespace mozilla::plugins;
using namespace mozilla::layers;
using namespace std;
#ifdef MOZ_WIDGET_GTK

View File

@ -20,7 +20,6 @@
#include "mozilla/gfx/QuartzSupport.h"
#include "base/timer.h"
using namespace mozilla::plugins::PluginUtilsOSX;
#endif
#include "npfunctions.h"
@ -555,7 +554,7 @@ private:
#ifdef XP_MACOSX
// Current IOSurface available for rendering
// We can't use thebes gfxASurface like other platforms.
nsDoubleBufferCARenderer mDoubleBufferCARenderer;
PluginUtilsOSX::nsDoubleBufferCARenderer mDoubleBufferCARenderer;
#endif
// (Not to be confused with mBackSurface). This is a recent copy

View File

@ -44,6 +44,7 @@ extern const PRUnichar* kFlashFullscreenClass;
#endif // defined(XP_MACOSX)
using namespace mozilla::plugins;
using namespace mozilla::layers;
bool
StreamNotifyParent::RecvRedirectNotifyResponse(const bool& allow)

View File

@ -29,7 +29,6 @@ class ImageContainer;
}
}
using namespace mozilla::layers;
namespace mozilla {
@ -68,7 +67,7 @@ public:
virtual nsresult NPP_GetSitesWithData(InfallibleTArray<nsCString>& aResult) = 0;
virtual nsresult AsyncSetWindow(NPP instance, NPWindow* window) = 0;
virtual nsresult GetImageContainer(NPP instance, ImageContainer** aContainer) = 0;
virtual nsresult GetImageContainer(NPP instance, mozilla::layers::ImageContainer** aContainer) = 0;
virtual nsresult GetImageSize(NPP instance, nsIntSize* aSize) = 0;
virtual bool IsOOP() = 0;
#if defined(XP_MACOSX)

View File

@ -10,7 +10,6 @@
#include "nsIGeolocationProvider.h"
#include "nsCOMPtr.h"
using namespace QtMobility;
class QTMLocationProvider : public QObject,
public nsIGeolocationProvider

View File

@ -15,6 +15,7 @@
#define CTYPES_STR "ctypes"
using namespace mozilla::dom;
USING_WORKERS_NAMESPACE
namespace {

View File

@ -12,6 +12,8 @@
#include "nsContentUtils.h"
#include "nsWrapperCacheInlines.h"
using namespace mozilla;
using namespace mozilla::dom;
USING_WORKERS_NAMESPACE
DOMBindingBase::DOMBindingBase(JSContext* aCx)

View File

@ -13,6 +13,7 @@
#include "Events.h"
#include "EventTarget.h"
using namespace mozilla::dom;
USING_WORKERS_NAMESPACE
using mozilla::ErrorResult;

View File

@ -7,6 +7,7 @@
USING_WORKERS_NAMESPACE
using mozilla::ErrorResult;
using namespace mozilla::dom;
void
EventTarget::_trace(JSTracer* aTrc)

View File

@ -14,7 +14,6 @@
#include "mozilla/dom/Nullable.h"
#include "mozilla/ErrorResult.h"
using namespace mozilla::dom;
BEGIN_WORKERS_NAMESPACE

View File

@ -29,7 +29,7 @@
#include "mozilla/dom/EncodingUtils.h"
USING_WORKERS_NAMESPACE
using mozilla::ErrorResult;
using namespace mozilla;
using mozilla::dom::Optional;
NS_IMPL_ADDREF_INHERITED(FileReaderSync, DOMBindingBase)

View File

@ -48,6 +48,7 @@
JSPROP_ENUMERATE
using namespace mozilla;
using namespace mozilla::dom;
USING_WORKERS_NAMESPACE
namespace {

View File

@ -32,6 +32,7 @@
using namespace mozilla;
using namespace mozilla::dom;
USING_WORKERS_NAMESPACE
using mozilla::dom::workers::exceptions::ThrowDOMExceptionForNSResult;

View File

@ -87,6 +87,7 @@
using namespace mozilla;
using namespace mozilla::dom;
using namespace mozilla::layers;
uint8_t gNotifySubDocInvalidationData;