corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out 2 changesets (bug 514280) for OSX build bustage on a CLOSED TREE

Browse Source 
Backed out changeset 2a015b45d808 (bug 514280)
Backed out changeset a01f97c1ed02 (bug 514280)
This commit is contained in:
Wes Kocher
2014-03-17 15:19:53 -07:00
parent 1552436a82
commit 5b4557e895
50 changed files with 99 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
content/canvas/src/DocumentRendererChild.cpp
View File

@@ -47,7 +47,7 @@ DocumentRendererChild::RenderDocument(nsIDOMWindow *window,
if (flushLayout)
nsContentUtils::FlushLayoutForTree(window);
nsRefPtr<nsPresContext> presContext;
nsCOMPtr<nsPresContext> presContext;
nsCOMPtr<nsPIDOMWindow> win = do_QueryInterface(window);
if (win) {
nsIDocShell* docshell = win->GetDocShell();

2
content/media/MediaDecoder.h
View File

@@ -1025,7 +1025,7 @@ protected:
// is synchronised on a monitor. The lifetime of this object is
// after mPlayState is LOADING and before mPlayState is SHUTDOWN. It
// is safe to access it during this period.
nsRefPtr<MediaDecoderStateMachine> mDecoderStateMachine;
nsCOMPtr<MediaDecoderStateMachine> mDecoderStateMachine;
// Media data resource.
nsRefPtr<MediaResource> mResource;

4
content/media/MediaDecoderStateMachine.cpp
View File

@@ -2060,7 +2060,7 @@ public:
}
private:
nsRefPtr<MediaDecoder> mDecoder;
nsRefPtr<MediaDecoderStateMachine> mStateMachine;
nsCOMPtr<MediaDecoderStateMachine> mStateMachine;
};
// Runnable which dispatches an event to the main thread to dispose of the
@@ -2079,7 +2079,7 @@ public:
}
private:
nsRefPtr<MediaDecoder> mDecoder;
nsRefPtr<MediaDecoderStateMachine> mStateMachine;
nsCOMPtr<MediaDecoderStateMachine> mStateMachine;
};
nsresult MediaDecoderStateMachine::RunStateMachine()

2
content/media/plugins/MediaPluginHost.h
View File

@@ -16,7 +16,7 @@ namespace mozilla {
class MediaPluginReader;
class MediaPluginHost {
nsRefPtr<MediaResourceServer> mResourceServer;
nsCOMPtr<MediaResourceServer> mResourceServer;
nsTArray<MPAPI::Manifest *> mPlugins;
MPAPI::Manifest *FindPlugin(const nsACString& aMimeType);

6
content/media/plugins/MediaResourceServer.cpp
View File

@@ -112,7 +112,7 @@ private:
// The MediaResourceServer that owns the MediaResource instances
// served. This is used to lookup the MediaResource from the URL.
nsRefPtr<MediaResourceServer> mServer;
nsCOMPtr<MediaResourceServer> mServer;
// Write 'aBufferLength' bytes from 'aBuffer' to 'mOutput'. This
// method ensures all the data is written by checking the number
@@ -342,7 +342,7 @@ class ResourceSocketListener : public nsIServerSocketListener
public:
// The MediaResourceServer used to look up the MediaResource
// on requests.
nsRefPtr<MediaResourceServer> mServer;
nsCOMPtr<MediaResourceServer> mServer;
public:
NS_DECL_THREADSAFE_ISUPPORTS
@@ -416,7 +416,7 @@ MediaResourceServer::Run()
already_AddRefed<MediaResourceServer>
MediaResourceServer::Start()
{
nsRefPtr<MediaResourceServer> server = new MediaResourceServer();
nsCOMPtr<MediaResourceServer> server = new MediaResourceServer();
NS_DispatchToMainThread(server, NS_DISPATCH_SYNC);
return server.forget();
}

2
content/media/webaudio/AudioContext.cpp
View File

@@ -460,7 +460,7 @@ AudioContext::DecodeAudioData(const ArrayBuffer& aBuffer,
aBuffer.Data(), aBuffer.Length(),
contentType);
nsRefPtr<DecodeErrorCallback> failureCallback;
nsCOMPtr<DecodeErrorCallback> failureCallback;
if (aFailureCallback.WasPassed()) {
failureCallback = &aFailureCallback.Value();
}

2
content/xml/document/src/nsXMLContentSink.cpp
View File

@@ -202,7 +202,7 @@ nsXMLContentSink::MaybePrettyPrint()
mCSSLoader->SetEnabled(true);
}
nsRefPtr<nsXMLPrettyPrinter> printer;
nsCOMPtr<nsXMLPrettyPrinter> printer;
nsresult rv = NS_NewXMLPrettyPrinter(getter_AddRefs(printer));
NS_ENSURE_SUCCESS(rv, rv);

2
content/xul/templates/src/nsXULTemplateQueryProcessorRDF.h
View File

@@ -44,7 +44,7 @@ class nsXULTemplateQueryProcessorRDF MOZ_FINAL : public nsIXULTemplateQueryProce
public nsIRDFObserver
{
public:
typedef nsTArray<nsRefPtr<nsXULTemplateResultRDF> > ResultArray;
typedef nsTArray<nsCOMPtr<nsXULTemplateResultRDF> > ResultArray;
nsXULTemplateQueryProcessorRDF();

2
dom/base/Navigator.h
View File

@@ -338,7 +338,7 @@ private:
nsRefPtr<Voicemail> mVoicemail;
#endif
#ifdef MOZ_B2G_BT
nsRefPtr<bluetooth::BluetoothManager> mBluetooth;
nsCOMPtr<bluetooth::BluetoothManager> mBluetooth;
#endif
#ifdef MOZ_AUDIO_CHANNEL_MANAGER
nsRefPtr<system::AudioChannelManager> mAudioChannelManager;

2
dom/base/nsContentPermissionHelper.cpp
View File

@@ -42,7 +42,7 @@ class ContentPermissionRequestParent : public PContentPermissionRequestParent
nsCOMPtr<nsIPrincipal> mPrincipal;
nsCOMPtr<Element> mElement;
nsRefPtr<nsContentPermissionRequestProxy> mProxy;
nsCOMPtr<nsContentPermissionRequestProxy> mProxy;
nsTArray<PermissionRequest> mRequests;
private:

2
dom/base/nsGlobalWindow.cpp
View File

@@ -5033,7 +5033,7 @@ nsGlobalWindow::GetDevicePixelRatio(ErrorResult& aError)
return 1.0;
}
nsRefPtr<nsPresContext> presContext;
nsCOMPtr<nsPresContext> presContext;
mDocShell->GetPresContext(getter_AddRefs(presContext));
if (!presContext) {
return 1.0;

40
dom/camera/DOMCameraControl.cpp
View File

@@ -613,7 +613,7 @@ nsDOMCameraControl::SensorAngle()
already_AddRefed<CameraShutterCallback>
nsDOMCameraControl::GetOnShutter()
{
nsRefPtr<CameraShutterCallback> cb = mOnShutterCb;
nsCOMPtr<CameraShutterCallback> cb = mOnShutterCb;
return cb.forget();
}
@@ -627,7 +627,7 @@ nsDOMCameraControl::SetOnShutter(CameraShutterCallback* aCb)
already_AddRefed<CameraClosedCallback>
nsDOMCameraControl::GetOnClosed()
{
nsRefPtr<CameraClosedCallback> onClosed = mOnClosedCb;
nsCOMPtr<CameraClosedCallback> onClosed = mOnClosedCb;
return onClosed.forget();
}
@@ -640,7 +640,7 @@ nsDOMCameraControl::SetOnClosed(CameraClosedCallback* aCb)
already_AddRefed<CameraRecorderStateChange>
nsDOMCameraControl::GetOnRecorderStateChange()
{
nsRefPtr<CameraRecorderStateChange> cb = mOnRecorderStateChangeCb;
nsCOMPtr<CameraRecorderStateChange> cb = mOnRecorderStateChangeCb;
return cb.forget();
}
@@ -654,7 +654,7 @@ nsDOMCameraControl::SetOnRecorderStateChange(CameraRecorderStateChange* aCb)
already_AddRefed<CameraPreviewStateChange>
nsDOMCameraControl::GetOnPreviewStateChange()
{
nsRefPtr<CameraPreviewStateChange> cb = mOnPreviewStateChangeCb;
nsCOMPtr<CameraPreviewStateChange> cb = mOnPreviewStateChangeCb;
return cb.forget();
}
void
@@ -783,7 +783,7 @@ nsDOMCameraControl::SetConfiguration(const CameraConfiguration& aConfiguration,
{
MOZ_ASSERT(mCameraControl);
nsRefPtr<CameraTakePictureCallback> cb = mTakePictureOnSuccessCb;
nsCOMPtr<CameraTakePictureCallback> cb = mTakePictureOnSuccessCb;
if (cb) {
// We're busy taking a picture, can't change modes right now.
if (aOnError.WasPassed()) {
@@ -822,12 +822,12 @@ nsDOMCameraControl::AutoFocus(CameraAutoFocusCallback& aOnSuccess,
{
MOZ_ASSERT(mCameraControl);
nsRefPtr<CameraAutoFocusCallback> cb = mAutoFocusOnSuccessCb.forget();
nsCOMPtr<CameraAutoFocusCallback> cb = mAutoFocusOnSuccessCb.forget();
bool cancel = false;
if (cb) {
// we have a callback, which means we're already in the process of
// auto-focusing--cancel the old callback
nsRefPtr<CameraErrorCallback> ecb = mAutoFocusOnErrorCb.forget();
nsCOMPtr<CameraErrorCallback> ecb = mAutoFocusOnErrorCb.forget();
if (ecb) {
ErrorResult ignored;
ecb->Call(NS_LITERAL_STRING("Interrupted"), ignored);
@@ -852,7 +852,7 @@ nsDOMCameraControl::TakePicture(const CameraPictureOptions& aOptions,
{
MOZ_ASSERT(mCameraControl);
nsRefPtr<CameraTakePictureCallback> cb = mTakePictureOnSuccessCb;
nsCOMPtr<CameraTakePictureCallback> cb = mTakePictureOnSuccessCb;
if (cb) {
// There is already a call to TakePicture() in progress, abort this one and
// invoke the error callback (if one was passed in).
@@ -971,7 +971,7 @@ nsDOMCameraControl::OnHardwareStateChange(CameraControlListener::HardwareState a
// The hardware is open, so we can return a camera to JS, even if
// the preview hasn't started yet.
if (mGetCameraOnSuccessCb) {
nsRefPtr<GetCameraCallback> cb = mGetCameraOnSuccessCb.forget();
nsCOMPtr<GetCameraCallback> cb = mGetCameraOnSuccessCb.forget();
ErrorResult ignored;
mGetCameraOnErrorCb = nullptr;
cb->Call(*this, *mCurrentConfiguration, ignored);
@@ -981,12 +981,12 @@ nsDOMCameraControl::OnHardwareStateChange(CameraControlListener::HardwareState a
case CameraControlListener::kHardwareClosed:
if (mReleaseOnSuccessCb) {
// If we have this event handler, this was a solicited hardware close.
nsRefPtr<CameraReleaseCallback> cb = mReleaseOnSuccessCb.forget();
nsCOMPtr<CameraReleaseCallback> cb = mReleaseOnSuccessCb.forget();
mReleaseOnErrorCb = nullptr;
cb->Call(ignored);
} else if(mOnClosedCb) {
// If not, something else closed the hardware.
nsRefPtr<CameraClosedCallback> cb = mOnClosedCb;
nsCOMPtr<CameraClosedCallback> cb = mOnClosedCb;
cb->Call(ignored);
}
break;
@@ -1003,7 +1003,7 @@ nsDOMCameraControl::OnShutter()
DOM_CAMERA_LOGI("DOM ** SNAP **\n");
nsRefPtr<CameraShutterCallback> cb = mOnShutterCb;
nsCOMPtr<CameraShutterCallback> cb = mOnShutterCb;
if (cb) {
ErrorResult ignored;
cb->Call(ignored);
@@ -1030,7 +1030,7 @@ nsDOMCameraControl::OnPreviewStateChange(CameraControlListener::PreviewState aSt
break;
}
nsRefPtr<CameraPreviewStateChange> cb = mOnPreviewStateChangeCb;
nsCOMPtr<CameraPreviewStateChange> cb = mOnPreviewStateChangeCb;
ErrorResult ignored;
cb->Call(state, ignored);
}
@@ -1048,7 +1048,7 @@ nsDOMCameraControl::OnRecorderStateChange(CameraControlListener::RecorderState a
switch (aState) {
case CameraControlListener::kRecorderStarted:
if (mStartRecordingOnSuccessCb) {
nsRefPtr<CameraStartRecordingCallback> cb = mStartRecordingOnSuccessCb.forget();
nsCOMPtr<CameraStartRecordingCallback> cb = mStartRecordingOnSuccessCb.forget();
mStartRecordingOnErrorCb = nullptr;
cb->Call(ignored);
}
@@ -1091,7 +1091,7 @@ nsDOMCameraControl::OnRecorderStateChange(CameraControlListener::RecorderState a
return;
}
nsRefPtr<CameraRecorderStateChange> cb = mOnRecorderStateChangeCb;
nsCOMPtr<CameraRecorderStateChange> cb = mOnRecorderStateChangeCb;
if (cb) {
cb->Call(state, ignored);
}
@@ -1117,7 +1117,7 @@ nsDOMCameraControl::OnConfigurationChange(DOMCameraConfiguration* aConfiguration
DOM_CAMERA_LOGI(" recorder profile : %s\n",
NS_ConvertUTF16toUTF8(mCurrentConfiguration->mRecorderProfile).get());
nsRefPtr<CameraSetConfigurationCallback> cb = mSetConfigurationOnSuccessCb.forget();
nsCOMPtr<CameraSetConfigurationCallback> cb = mSetConfigurationOnSuccessCb.forget();
mSetConfigurationOnErrorCb = nullptr;
if (cb) {
ErrorResult ignored;
@@ -1130,7 +1130,7 @@ nsDOMCameraControl::OnAutoFocusComplete(bool aAutoFocusSucceeded)
{
MOZ_ASSERT(NS_IsMainThread());
nsRefPtr<CameraAutoFocusCallback> cb = mAutoFocusOnSuccessCb.forget();
nsCOMPtr<CameraAutoFocusCallback> cb = mAutoFocusOnSuccessCb.forget();
mAutoFocusOnErrorCb = nullptr;
if (cb) {
ErrorResult ignored;
@@ -1143,7 +1143,7 @@ nsDOMCameraControl::OnTakePictureComplete(nsIDOMBlob* aPicture)
{
MOZ_ASSERT(NS_IsMainThread());
nsRefPtr<CameraTakePictureCallback> cb = mTakePictureOnSuccessCb.forget();
nsCOMPtr<CameraTakePictureCallback> cb = mTakePictureOnSuccessCb.forget();
mTakePictureOnErrorCb = nullptr;
if (!cb) {
// Warn because it shouldn't be possible to get here without
@@ -1164,7 +1164,7 @@ nsDOMCameraControl::OnError(CameraControlListener::CameraErrorContext aContext,
NS_LossyConvertUTF16toASCII(aError).get());
MOZ_ASSERT(NS_IsMainThread());
nsRefPtr<CameraErrorCallback>* errorCb;
nsCOMPtr<CameraErrorCallback>* errorCb;
switch (aContext) {
case CameraControlListener::kInStartCamera:
mGetCameraOnSuccessCb = nullptr;
@@ -1240,7 +1240,7 @@ nsDOMCameraControl::OnError(CameraControlListener::CameraErrorContext aContext,
}
// kung-fu death grip
nsRefPtr<CameraErrorCallback> cb = (*errorCb).forget();
nsCOMPtr<CameraErrorCallback> cb = (*errorCb).forget();
ErrorResult ignored;
cb->Call(aError, ignored);
}

32
dom/camera/DOMCameraControl.h
View File

@@ -168,24 +168,24 @@ protected:
nsRefPtr<dom::CameraCapabilities> mCapabilities;
// solicited camera control event handlers
nsRefPtr<dom::GetCameraCallback> mGetCameraOnSuccessCb;
nsRefPtr<dom::CameraErrorCallback> mGetCameraOnErrorCb;
nsRefPtr<dom::CameraAutoFocusCallback> mAutoFocusOnSuccessCb;
nsRefPtr<dom::CameraErrorCallback> mAutoFocusOnErrorCb;
nsRefPtr<dom::CameraTakePictureCallback> mTakePictureOnSuccessCb;
nsRefPtr<dom::CameraErrorCallback> mTakePictureOnErrorCb;
nsRefPtr<dom::CameraStartRecordingCallback> mStartRecordingOnSuccessCb;
nsRefPtr<dom::CameraErrorCallback> mStartRecordingOnErrorCb;
nsRefPtr<dom::CameraReleaseCallback> mReleaseOnSuccessCb;
nsRefPtr<dom::CameraErrorCallback> mReleaseOnErrorCb;
nsRefPtr<dom::CameraSetConfigurationCallback> mSetConfigurationOnSuccessCb;
nsRefPtr<dom::CameraErrorCallback> mSetConfigurationOnErrorCb;
nsCOMPtr<dom::GetCameraCallback> mGetCameraOnSuccessCb;
nsCOMPtr<dom::CameraErrorCallback> mGetCameraOnErrorCb;
nsCOMPtr<dom::CameraAutoFocusCallback> mAutoFocusOnSuccessCb;
nsCOMPtr<dom::CameraErrorCallback> mAutoFocusOnErrorCb;
nsCOMPtr<dom::CameraTakePictureCallback> mTakePictureOnSuccessCb;
nsCOMPtr<dom::CameraErrorCallback> mTakePictureOnErrorCb;
nsCOMPtr<dom::CameraStartRecordingCallback> mStartRecordingOnSuccessCb;
nsCOMPtr<dom::CameraErrorCallback> mStartRecordingOnErrorCb;
nsCOMPtr<dom::CameraReleaseCallback> mReleaseOnSuccessCb;
nsCOMPtr<dom::CameraErrorCallback> mReleaseOnErrorCb;
nsCOMPtr<dom::CameraSetConfigurationCallback> mSetConfigurationOnSuccessCb;
nsCOMPtr<dom::CameraErrorCallback> mSetConfigurationOnErrorCb;
// unsolicited event handlers
nsRefPtr<dom::CameraShutterCallback> mOnShutterCb;
nsRefPtr<dom::CameraClosedCallback> mOnClosedCb;
nsRefPtr<dom::CameraRecorderStateChange> mOnRecorderStateChangeCb;
nsRefPtr<dom::CameraPreviewStateChange> mOnPreviewStateChangeCb;
nsCOMPtr<dom::CameraShutterCallback> mOnShutterCb;
nsCOMPtr<dom::CameraClosedCallback> mOnClosedCb;
nsCOMPtr<dom::CameraRecorderStateChange> mOnRecorderStateChangeCb;
nsCOMPtr<dom::CameraPreviewStateChange> mOnPreviewStateChangeCb;
// Camera event listener; we only need this weak reference so that
// we can remove the listener from the camera when we're done

2
dom/camera/DOMCameraManager.cpp
View File

@@ -119,7 +119,7 @@ nsDOMCameraManager::GetCamera(const nsAString& aCamera,
cameraId = 1;
}
nsRefPtr<CameraErrorCallback> errorCallback = nullptr;
nsCOMPtr<CameraErrorCallback> errorCallback = nullptr;
if (aOnError.WasPassed()) {
errorCallback = &aOnError.Value();
}

2
dom/devicestorage/DeviceStorageRequestChild.cpp
View File

@@ -190,7 +190,7 @@ DeviceStorageRequestChild::
cursor->mFiles.AppendElement(dsf);
}
nsRefPtr<ContinueCursorEvent> event = new ContinueCursorEvent(cursor);
nsCOMPtr<ContinueCursorEvent> event = new ContinueCursorEvent(cursor);
event->Continue();
break;
}

4
dom/ipc/ContentParent.cpp
View File

@@ -3329,7 +3329,7 @@ ContentParent::RecvAddIdleObserver(const uint64_t& aObserver, const uint32_t& aI
do_GetService("@mozilla.org/widget/idleservice;1", &rv);
NS_ENSURE_SUCCESS(rv, false);
nsRefPtr<ParentIdleListener> listener = new ParentIdleListener(this, aObserver);
nsCOMPtr<ParentIdleListener> listener = new ParentIdleListener(this, aObserver);
mIdleListeners.Put(aObserver, listener);
idleService->AddIdleObserver(listener, aIdleTimeInS);
return true;
@@ -3343,7 +3343,7 @@ ContentParent::RecvRemoveIdleObserver(const uint64_t& aObserver, const uint32_t&
do_GetService("@mozilla.org/widget/idleservice;1", &rv);
NS_ENSURE_SUCCESS(rv, false);
nsRefPtr<ParentIdleListener> listener;
nsCOMPtr<ParentIdleListener> listener;
bool found = mIdleListeners.Get(aObserver, &listener);
if (found) {
mIdleListeners.Remove(aObserver);

2
dom/ipc/ContentParent.h
View File

@@ -585,7 +585,7 @@ private:
nsRefPtr<nsConsoleService> mConsoleService;
nsConsoleService* GetConsoleService();
nsDataHashtable<nsUint64HashKey, nsRefPtr<ParentIdleListener> > mIdleListeners;
nsDataHashtable<nsUint64HashKey, nsCOMPtr<ParentIdleListener> > mIdleListeners;
#ifdef MOZ_X11
// Dup of child's X socket, used to scope its resources to this

2
dom/plugins/base/nsNPAPIPluginInstance.h
View File

@@ -326,7 +326,7 @@ protected:
friend class PluginEventRunnable;
nsTArray<nsRefPtr<PluginEventRunnable>> mPostedEvents;
nsTArray<nsCOMPtr<PluginEventRunnable>> mPostedEvents;
void PopPostedEvent(PluginEventRunnable* r);
void OnSurfaceTextureFrameAvailable();

2
dom/smil/nsSMILTimeValueSpec.h
View File

@@ -124,7 +124,7 @@ protected:
private:
nsSMILTimeValueSpec* mSpec;
};
nsRefPtr<EventListener> mEventListener;
nsCOMPtr<EventListener> mEventListener;
};
#endif // NS_SMILTIMEVALUESPEC_H_

2
editor/composer/src/nsEditorSpellCheck.cpp
View File

@@ -144,7 +144,7 @@ public:
nsString mDictionary;
private:
nsRefPtr<nsEditorSpellCheck> mSpellCheck;
nsCOMPtr<nsEditorSpellCheck> mSpellCheck;
};
NS_IMPL_ISUPPORTS1(DictionaryFetcher, nsIContentPrefCallback2)

3
embedding/components/find/src/nsFind.h
View File

@@ -8,7 +8,6 @@
#include "nsIFind.h"
#include "nsAutoPtr.h"
#include "nsCOMPtr.h"
#include "nsCycleCollectionParticipant.h"
#include "nsIDOMNode.h"
@@ -70,7 +69,7 @@ protected:
// The iterator we use to move through the document:
nsresult InitIterator(nsIDOMNode* aStartNode, int32_t aStartOffset,
nsIDOMNode* aEndNode, int32_t aEndOffset);
nsRefPtr<nsFindContentIterator> mIterator;
nsCOMPtr<nsFindContentIterator> mIterator;
};
#endif // nsFind_h__

3
extensions/auth/nsAuthFactory.cpp
View File

@@ -4,7 +4,6 @@
#include "mozilla/ModuleUtils.h"
#include "nsAuth.h"
#include "nsAutoPtr.h"
//-----------------------------------------------------------------------------
@@ -113,7 +112,7 @@ nsSambaNTLMAuthConstructor(nsISupports *outer, REFNSIID iid, void **result)
if (outer)
return NS_ERROR_NO_AGGREGATION;
nsRefPtr<nsAuthSambaNTLM> auth = new nsAuthSambaNTLM();
nsCOMPtr<nsAuthSambaNTLM> auth = new nsAuthSambaNTLM();
if (!auth)
return NS_ERROR_OUT_OF_MEMORY;

2
extensions/spellcheck/src/mozInlineSpellChecker.h
View File

@@ -171,7 +171,7 @@ private:
// When mPendingSpellCheck is non-null, this is the callback passed when
// it was initialized.
nsRefPtr<InitEditorSpellCheckCallback> mPendingInitEditorSpellCheckCallback;
nsCOMPtr<InitEditorSpellCheckCallback> mPendingInitEditorSpellCheckCallback;
// Set when we have spellchecked after the last edit operation. See the
// commment at the top of the .cpp file for more info.

2
gfx/layers/LayerScope.cpp
View File

@@ -314,7 +314,7 @@ public:
private:
nsTArray<nsRefPtr<LayerScopeWebSocketHandler> > mHandlers;
nsCOMPtr<nsIThread> mDebugSenderThread;
nsRefPtr<DebugDataSender> mCurrentSender;
nsCOMPtr<DebugDataSender> mCurrentSender;
nsCOMPtr<nsIServerSocket> mServerSocket;
};

2
ipc/glue/BackgroundImpl.cpp
View File

@@ -1521,7 +1521,7 @@ ChildImpl::GetOrCreateForCurrentThread(
return true;
}
nsRefPtr<CreateActorRunnable> runnable = new CreateActorRunnable();
nsCOMPtr<CreateActorRunnable> runnable = new CreateActorRunnable();
if (NS_FAILED(NS_DispatchToMainThread(runnable, NS_DISPATCH_NORMAL))) {
CRASH_IN_CHILD_PROCESS("Failed to dispatch to main thread!");
return false;

2
layout/generic/nsSubDocumentFrame.cpp
View File

@@ -1042,7 +1042,7 @@ EndSwapDocShellsForDocument(nsIDocument* aDocument, void*)
nsCOMPtr<nsIContentViewer> cv;
ds->GetContentViewer(getter_AddRefs(cv));
while (cv) {
nsRefPtr<nsPresContext> pc;
nsCOMPtr<nsPresContext> pc;
cv->GetPresContext(getter_AddRefs(pc));
if (pc && pc->GetPresShell()) {
pc->GetPresShell()->SetNeverPainting(ds->IsInvisible());

2
layout/inspector/nsFontFaceList.cpp
View File

@@ -84,7 +84,7 @@ nsFontFaceList::AddFontsFromTextRun(gfxTextRun* aTextRun,
existingFace->AddMatchType(iter.GetGlyphRun()->mMatchType);
} else {
// A new font entry we haven't seen before
nsRefPtr<nsFontFace> ff =
nsCOMPtr<nsFontFace> ff =
new nsFontFace(fe, aTextRun->GetFontGroup(),
iter.GetGlyphRun()->mMatchType);
mFontFaces.Put(fe, ff);

2
layout/mathml/nsMathMLmactionFrame.h
View File

@@ -62,7 +62,7 @@ private:
int32_t mActionType;
int32_t mChildCount;
int32_t mSelection;
nsRefPtr<MouseListener> mListener;
nsCOMPtr<MouseListener> mListener;
// helper to return the frame for the attribute selection="number"
nsIFrame*

3
layout/style/MediaQueryList.h
View File

@@ -11,6 +11,7 @@
#include "nsISupports.h"
#include "nsCycleCollectionParticipant.h"
#include "nsAutoPtr.h"
#include "nsCOMPtr.h"
#include "nsTArray.h"
#include "prclist.h"
#include "mozilla/Attributes.h"
@@ -43,7 +44,7 @@ public:
struct HandleChangeData {
nsRefPtr<MediaQueryList> mql;
nsRefPtr<mozilla::dom::MediaQueryListListener> callback;
nsCOMPtr<mozilla::dom::MediaQueryListListener> callback;
};
typedef FallibleTArray< nsRefPtr<mozilla::dom::MediaQueryListListener> > CallbackList;

2
media/mtransport/nriceresolver.cpp
View File

@@ -149,7 +149,7 @@ int NrIceResolver::resolve(nr_resolver_resource *resource,
int _status;
MOZ_ASSERT(allocated_resolvers_ > 0);
ASSERT_ON_THREAD(sts_thread_);
nsRefPtr<PendingResolution> pr;
nsCOMPtr<PendingResolution> pr;
if (resource->transport_protocol != IPPROTO_UDP &&
resource->transport_protocol != IPPROTO_TCP) {

2
media/mtransport/transportlayerprsock.h
View File

@@ -109,7 +109,7 @@ class TransportLayerPrsock : public TransportLayer {
}
PRFileDesc *fd_;
nsRefPtr<SocketHandler> handler_;
nsCOMPtr<SocketHandler> handler_;
nsCOMPtr<nsISocketTransportService> stservice_;
};

2
netwerk/base/src/BackgroundFileSaver.cpp
View File

@@ -82,7 +82,7 @@ public:
}
private:
nsRefPtr<BackgroundFileSaver> mSaver;
nsCOMPtr<BackgroundFileSaver> mSaver;
nsCOMPtr<nsIFile> mTarget;
};

2
netwerk/base/src/nsUDPSocket.cpp
View File

@@ -352,7 +352,7 @@ nsUDPSocket::OnSocketReady(PRFileDesc *fd, int16_t outFlags)
return;
}
nsRefPtr<nsUDPOutputStream> os = new nsUDPOutputStream(this, mFD, prClientAddr);
nsCOMPtr<nsUDPOutputStream> os = new nsUDPOutputStream(this, mFD, prClientAddr);
rv = NS_AsyncCopy(pipeIn, os, mSts,
NS_ASYNCCOPY_VIA_READSEGMENTS, 1400);

2
netwerk/cache/nsCacheEntryDescriptor.cpp vendored
View File

@@ -64,7 +64,7 @@ public:
}
private:
nsRefPtr<nsCacheEntryDescriptor> mDescriptor;
nsCOMPtr<nsCacheEntryDescriptor> mDescriptor;
nsICacheListener *mListener;
nsCOMPtr<nsIThread> mThread;
};

2
netwerk/cache2/CacheIndex.cpp
View File

@@ -1698,7 +1698,7 @@ private:
char *mBuf;
uint32_t mBufSize;
int32_t mBufPos;
nsRefPtr<CacheHash> mHash;
nsCOMPtr<CacheHash> mHash;
};
nsresult

4
netwerk/test/TestUDPSocket.cpp
View File

@@ -213,7 +213,7 @@ main(int32_t argc, char *argv[])
NS_ENSURE_SUCCESS(rv, -1);
// Create UDPServerListener to process UDP packets
nsRefPtr<UDPServerListener> serverListener = new UDPServerListener();
nsCOMPtr<UDPServerListener> serverListener = new UDPServerListener();
// Bind server socket to 127.0.0.1
rv = server->Init(0, true);
@@ -223,7 +223,7 @@ main(int32_t argc, char *argv[])
server->AsyncListen(serverListener);
// Bind clinet on arbitrary port
nsRefPtr<UDPClientListener> clientListener = new UDPClientListener();
nsCOMPtr<UDPClientListener> clientListener = new UDPClientListener();
client->Init(0, true);
client->AsyncListen(clientListener);

2
parser/xml/src/nsSAXXMLReader.cpp
View File

@@ -87,7 +87,7 @@ nsSAXXMLReader::HandleStartElement(const char16_t *aName,
if (!mContentHandler)
return NS_OK;
nsRefPtr<nsSAXAttributes> atts = new nsSAXAttributes();
nsCOMPtr<nsSAXAttributes> atts = new nsSAXAttributes();
if (!atts)
return NS_ERROR_OUT_OF_MEMORY;
nsAutoString uri, localName, qName;

4
security/manager/ssl/src/nsNSSCallbacks.cpp
View File

@@ -59,7 +59,7 @@ public:
nsNSSHttpRequestSession *mRequestSession;
nsRefPtr<nsHTTPListener> mListener;
nsCOMPtr<nsHTTPListener> mListener;
bool mResponsibleForDoneSignal;
TimeStamp mStartTime;
};
@@ -167,7 +167,7 @@ nsHTTPDownloadEvent::Run()
}
struct nsCancelHTTPDownloadEvent : nsRunnable {
nsRefPtr<nsHTTPListener> mListener;
nsCOMPtr<nsHTTPListener> mListener;
NS_IMETHOD Run() {
mListener->FreeLoadGroup(true);

3
security/manager/ssl/src/nsNSSCallbacks.h
View File

@@ -7,7 +7,6 @@
#ifndef _NSNSSCALLBACKS_H_
#define _NSNSSCALLBACKS_H_
#include "nsAutoPtr.h"
#include "nsCOMPtr.h"
#include "pk11func.h"
#include "nspr.h"
@@ -121,7 +120,7 @@ public:
PRIntervalTime mTimeoutInterval;
nsRefPtr<nsHTTPListener> mListener;
nsCOMPtr<nsHTTPListener> mListener;
protected:
nsNSSHttpRequestSession();

4
storage/src/VacuumManager.cpp
View File

@@ -206,7 +206,7 @@ Vacuumer::execute()
rv = mDBConn->CreateAsyncStatement(pageSizeQuery,
getter_AddRefs(pageSizeStmt));
NS_ENSURE_SUCCESS(rv, false);
nsRefPtr<BaseCallback> callback = new BaseCallback();
nsCOMPtr<BaseCallback> callback = new BaseCallback();
nsCOMPtr<mozIStoragePendingStatement> ps;
rv = pageSizeStmt->ExecuteAsync(callback, getter_AddRefs(ps));
NS_ENSURE_SUCCESS(rv, false);
@@ -375,7 +375,7 @@ VacuumManager::Observe(nsISupports *aSubject,
}
int32_t index;
for (index = startIndex; index < entries.Count(); ++index) {
nsRefPtr<Vacuumer> vacuum = new Vacuumer(entries[index]);
nsCOMPtr<Vacuumer> vacuum = new Vacuumer(entries[index]);
// Only vacuum one database per day.
if (vacuum->execute()) {
break;

2
toolkit/components/url-classifier/nsUrlClassifierDBService.h
View File

@@ -81,7 +81,7 @@ private:
nsresult CheckClean(const nsACString &lookupKey,
bool *clean);
nsRefPtr<nsUrlClassifierDBServiceWorker> mWorker;
nsCOMPtr<nsUrlClassifierDBServiceWorker> mWorker;
nsCOMPtr<nsIUrlClassifierDBServiceWorker> mWorkerProxy;
nsInterfaceHashtable<nsCStringHashKey, nsIUrlClassifierHashCompleter> mCompleters;

10
toolkit/profile/nsToolkitProfileService.cpp
View File

@@ -50,7 +50,7 @@ public:
NS_DECL_NSITOOLKITPROFILE
friend class nsToolkitProfileService;
nsRefPtr<nsToolkitProfile> mNext;
nsCOMPtr<nsToolkitProfile> mNext;
nsToolkitProfile *mPrev;
~nsToolkitProfile() { }
@@ -85,7 +85,7 @@ public:
~nsToolkitProfileLock();
private:
nsRefPtr<nsToolkitProfile> mProfile;
nsCOMPtr<nsToolkitProfile> mProfile;
nsCOMPtr<nsIFile> mDirectory;
nsCOMPtr<nsIFile> mLocalDirectory;
@@ -156,7 +156,7 @@ private:
{ mCurrent = first; }
private:
~ProfileEnumerator() { }
nsRefPtr<nsToolkitProfile> mCurrent;
nsCOMPtr<nsToolkitProfile> mCurrent;
};
};
@@ -274,7 +274,7 @@ nsToolkitProfile::Lock(nsIProfileUnlocker* *aUnlocker, nsIProfileLock* *aResult)
return NS_OK;
}
nsRefPtr<nsToolkitProfileLock> lock = new nsToolkitProfileLock();
nsCOMPtr<nsToolkitProfileLock> lock = new nsToolkitProfileLock();
if (!lock) return NS_ERROR_OUT_OF_MEMORY;
nsresult rv = lock->Init(this, aUnlocker);
@@ -595,7 +595,7 @@ nsresult
NS_LockProfilePath(nsIFile* aPath, nsIFile* aTempPath,
nsIProfileUnlocker* *aUnlocker, nsIProfileLock* *aResult)
{
nsRefPtr<nsToolkitProfileLock> lock = new nsToolkitProfileLock();
nsCOMPtr<nsToolkitProfileLock> lock = new nsToolkitProfileLock();
if (!lock) return NS_ERROR_OUT_OF_MEMORY;
nsresult rv = lock->Init(aPath, aTempPath, aUnlocker);

2
uriloader/exthandler/android/nsExternalSharingAppService.cpp
View File

@@ -52,7 +52,7 @@ nsExternalSharingAppService::GetSharingApps(const nsAString & aMIMEType,
static_cast<nsISharingHandlerApp**>(NS_Alloc(sizeof(nsISharingHandlerApp*)
* *aLen));
for (uint32_t i = 0; i < *aLen; i++) {
rv = array->QueryElementAt(i, NS_GET_IID(nsISharingHandlerApp),
rv = array->QueryElementAt(i, nsISharingHandlerApp::GetIID(),
(void**)(*aHandlers + i));
NS_ENSURE_SUCCESS(rv, rv);
}

2
widget/android/nsAppShell.cpp
View File

@@ -362,7 +362,7 @@ nsAppShell::ProcessNextNativeEvent(bool mayWait)
int32_t tabId = curEvent->MetaState();
const nsTArray<nsIntPoint>& points = curEvent->Points();
RefCountedJavaObject* buffer = curEvent->ByteBuffer();
nsRefPtr<ThumbnailRunnable> sr = new ThumbnailRunnable(mBrowserApp, tabId, points, buffer);
nsCOMPtr<ThumbnailRunnable> sr = new ThumbnailRunnable(mBrowserApp, tabId, points, buffer);
MessageLoop::current()->PostIdleTask(FROM_HERE, NewRunnableMethod(sr.get(), &ThumbnailRunnable::Run));
break;
}

2
widget/xpwidgets/nsBaseWidget.h
View File

@@ -406,7 +406,7 @@ protected:
nsRefPtr<LayerManager> mBasicLayerManager;
nsRefPtr<CompositorChild> mCompositorChild;
nsRefPtr<CompositorParent> mCompositorParent;
nsRefPtr<WidgetShutdownObserver> mShutdownObserver;
nsCOMPtr<WidgetShutdownObserver> mShutdownObserver;
nscolor mBackground;
nscolor mForeground;
nsCursor mCursor;

2
xpcom/ds/nsINIParserImpl.cpp
View File

@@ -34,7 +34,7 @@ nsINIParserFactory::CreateINIParser(nsIFile* aINIFile,
{
*aResult = nullptr;
nsRefPtr<nsINIParserImpl> p(new nsINIParserImpl());
nsCOMPtr<nsINIParserImpl> p(new nsINIParserImpl());
if (!p)
return NS_ERROR_OUT_OF_MEMORY;

3
xpcom/glue/nsID.h
View File

@@ -123,7 +123,8 @@ typedef nsID nsIID;
struct COMTypeInfo \
{ \
static const nsIID kIID NS_HIDDEN; \
};
}; \
static const nsIID& GetIID() {return COMTypeInfo<int>::kIID;}
#define NS_DEFINE_STATIC_IID_ACCESSOR(the_interface, the_iid) \
template <class Dummy> \

4
xpcom/tests/TestCOMPtr.cpp
View File

@@ -137,7 +137,7 @@ IFoo::QueryInterface( const nsIID& aIID, void** aResult )
nsISupports* rawPtr = 0;
nsresult status = NS_OK;
if ( aIID.Equals(NS_GET_IID(IFoo)) )
if ( aIID.Equals(GetIID()) )
rawPtr = this;
else
{
@@ -227,7 +227,7 @@ IBar::QueryInterface( const nsID& aIID, void** aResult )
nsISupports* rawPtr = 0;
nsresult status = NS_OK;
if ( aIID.Equals(NS_GET_IID(IBar)) )
if ( aIID.Equals(GetIID()) )
rawPtr = this;
else if ( aIID.Equals(NS_GET_IID(IFoo)) )
rawPtr = static_cast<IFoo*>(this);

2
xpcom/tests/TestHashtables.cpp
View File

@@ -281,7 +281,7 @@ IFoo::QueryInterface( const nsIID& aIID, void** aResult )
nsISupports* rawPtr = 0;
nsresult status = NS_OK;
if ( aIID.Equals(NS_GET_IID(IFoo)) )
if ( aIID.Equals(GetIID()) )
rawPtr = this;
else
{

4
xpcom/tests/TestRefPtr.cpp
View File

@@ -138,7 +138,7 @@ Foo::QueryInterface( const nsIID& aIID, void** aResult )
nsISupports* rawPtr = 0;
nsresult status = NS_OK;
if ( aIID.Equals(NS_GET_IID(Foo)) )
if ( aIID.Equals(GetIID()) )
rawPtr = this;
else
{
@@ -228,7 +228,7 @@ Bar::QueryInterface( const nsID& aIID, void** aResult )
nsISupports* rawPtr = 0;
nsresult status = NS_OK;
if ( aIID.Equals(NS_GET_IID(Bar)) )
if ( aIID.Equals(GetIID()) )
rawPtr = this;
else if ( aIID.Equals(NS_GET_IID(Foo)) )
rawPtr = static_cast<Foo*>(this);