author | Chris Peterson <cpeterson@mozilla.com> |
Tue, 06 Jan 2015 21:39:46 -0800 | |
changeset 250630 | cadb53efd449dfb7f4f8af292b7421da2746835e |
parent 250629 | 1831405086dc4c3a8b10b632da3f62ba43b85beb |
child 250631 | 6bed029c93f6cb2d93b3cc668260b3ef141ff2f7 |
push id | 698 |
push user | jlund@mozilla.com |
push date | Mon, 23 Mar 2015 22:08:11 +0000 |
treeherder | mozilla-release@b0c0ae7b02a3 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | Waldo |
bugs | 1118076 |
milestone | 37.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/dom/base/FragmentOrElement.cpp +++ b/dom/base/FragmentOrElement.cpp @@ -2105,17 +2105,17 @@ private: const char* mLiteral; nsAutoString* mString; const nsTextFragment* mTextFragment; }; Type mType; uint32_t mLength; }; public: - StringBuilder() : mLast(MOZ_THIS_IN_INITIALIZER_LIST()), mLength(0) + StringBuilder() : mLast(this), mLength(0) { MOZ_COUNT_CTOR(StringBuilder); } ~StringBuilder() { MOZ_COUNT_DTOR(StringBuilder); }
--- a/dom/base/ImportManager.cpp +++ b/dom/base/ImportManager.cpp @@ -288,17 +288,17 @@ NS_IMPL_CYCLE_COLLECTION(ImportLoader, ImportLoader::ImportLoader(nsIURI* aURI, nsIDocument* aImportParent) : mURI(aURI) , mImportParent(aImportParent) , mBlockingPredecessor(nullptr) , mReady(false) , mStopped(false) , mBlockingScripts(false) - , mUpdater(MOZ_THIS_IN_INITIALIZER_LIST()) + , mUpdater(this) { } void ImportLoader::BlockScripts() { MOZ_ASSERT(!mBlockingScripts); mImportParent->ScriptLoader()->AddExecuteBlocker();
--- a/dom/base/nsINode.h +++ b/dom/base/nsINode.h @@ -312,17 +312,17 @@ public: #ifdef MOZILLA_INTERNAL_API explicit nsINode(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo) : mNodeInfo(aNodeInfo), mParent(nullptr), mBoolFlags(0), mNextSibling(nullptr), mPreviousSibling(nullptr), mFirstChild(nullptr), - mSubtreeRoot(MOZ_THIS_IN_INITIALIZER_LIST()), + mSubtreeRoot(this), mSlots(nullptr) { } #endif virtual ~nsINode(); /**
--- a/dom/bindings/TypedArray.h +++ b/dom/bindings/TypedArray.h @@ -131,17 +131,16 @@ public: GetLengthAndData(mTypedObj, &mLength, &mData); mComputed = true; } private: TypedArray_base(const TypedArray_base&) = delete; }; - template<typename T, JSObject* UnwrapArray(JSObject*), T* GetData(JSObject*, const JS::AutoCheckCannotGC&), void GetLengthAndData(JSObject*, uint32_t*, T**), JSObject* CreateNew(JSContext*, uint32_t)> struct TypedArray : public TypedArray_base<T, UnwrapArray, GetLengthAndData> { private: typedef TypedArray_base<T, UnwrapArray, GetLengthAndData> Base; @@ -296,26 +295,24 @@ private: // Class for easily setting up a rooted typed array object on the stack template<typename ArrayType> class MOZ_STACK_CLASS RootedTypedArray : public ArrayType, private TypedArrayRooter<ArrayType> { public: explicit RootedTypedArray(JSContext* cx MOZ_GUARD_OBJECT_NOTIFIER_PARAM) : ArrayType(), - TypedArrayRooter<ArrayType>(cx, - MOZ_THIS_IN_INITIALIZER_LIST() + TypedArrayRooter<ArrayType>(cx, this MOZ_GUARD_OBJECT_NOTIFIER_PARAM_TO_PARENT) { } RootedTypedArray(JSContext* cx, JSObject* obj MOZ_GUARD_OBJECT_NOTIFIER_PARAM) : ArrayType(obj), - TypedArrayRooter<ArrayType>(cx, - MOZ_THIS_IN_INITIALIZER_LIST() + TypedArrayRooter<ArrayType>(cx, this MOZ_GUARD_OBJECT_NOTIFIER_PARAM_TO_PARENT) { } }; } // namespace dom } // namespace mozilla
--- a/dom/camera/DOMCameraDetectedFace.cpp +++ b/dom/camera/DOMCameraDetectedFace.cpp @@ -31,17 +31,17 @@ DOMCameraDetectedFace::WrapObject(JSCont return CameraDetectedFaceBinding::Wrap(aCx, this); } DOMCameraDetectedFace::DOMCameraDetectedFace(nsISupports* aParent, const ICameraControl::Face& aFace) : mParent(aParent) , mId(aFace.id) , mScore(aFace.score) - , mBounds(new DOMRect(MOZ_THIS_IN_INITIALIZER_LIST())) + , mBounds(new DOMRect(this)) { mBounds->SetRect(aFace.bound.left, aFace.bound.top, aFace.bound.right - aFace.bound.left, aFace.bound.bottom - aFace.bound.top); if (aFace.hasLeftEye) { mLeftEye = new DOMPoint(this, aFace.leftEye.x, aFace.leftEye.y);
--- a/dom/html/HTMLAnchorElement.h +++ b/dom/html/HTMLAnchorElement.h @@ -23,17 +23,17 @@ class HTMLAnchorElement MOZ_FINAL : publ public Link { public: using Element::GetText; using Element::SetText; explicit HTMLAnchorElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo) : nsGenericHTMLElement(aNodeInfo) - , Link(MOZ_THIS_IN_INITIALIZER_LIST()) + , Link(this) { } // nsISupports NS_DECL_ISUPPORTS_INHERITED // CC NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(HTMLAnchorElement,
--- a/dom/html/HTMLAreaElement.cpp +++ b/dom/html/HTMLAreaElement.cpp @@ -14,17 +14,17 @@ NS_IMPL_NS_NEW_HTML_ELEMENT(Area) namespace mozilla { namespace dom { HTMLAreaElement::HTMLAreaElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo) : nsGenericHTMLElement(aNodeInfo) - , Link(MOZ_THIS_IN_INITIALIZER_LIST()) + , Link(this) { } HTMLAreaElement::~HTMLAreaElement() { } NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLAreaElement)
--- a/dom/html/HTMLFormElement.cpp +++ b/dom/html/HTMLFormElement.cpp @@ -83,17 +83,17 @@ static const nsAttrValue::EnumTable kFor // Default autocomplete value is 'on'. static const nsAttrValue::EnumTable* kFormDefaultAutocomplete = &kFormAutocompleteTable[0]; bool HTMLFormElement::gFirstFormSubmitted = false; bool HTMLFormElement::gPasswordManagerInitialized = false; HTMLFormElement::HTMLFormElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo) : nsGenericHTMLElement(aNodeInfo), - mControls(new HTMLFormControlsCollection(MOZ_THIS_IN_INITIALIZER_LIST())), + mControls(new HTMLFormControlsCollection(this)), mSelectedRadioButtons(2), mRequiredRadioButtonCounts(2), mValueMissingRadioGroups(2), mGeneratingSubmit(false), mGeneratingReset(false), mIsSubmitting(false), mDeferSubmission(false), mNotifiedObservers(false),
--- a/dom/html/HTMLLinkElement.cpp +++ b/dom/html/HTMLLinkElement.cpp @@ -32,17 +32,17 @@ NS_IMPL_NS_NEW_HTML_ELEMENT(Link) namespace mozilla { namespace dom { HTMLLinkElement::HTMLLinkElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo) : nsGenericHTMLElement(aNodeInfo) - , Link(MOZ_THIS_IN_INITIALIZER_LIST()) + , Link(this) { } HTMLLinkElement::~HTMLLinkElement() { } NS_IMPL_CYCLE_COLLECTION_CLASS(HTMLLinkElement)
--- a/dom/html/HTMLSelectElement.cpp +++ b/dom/html/HTMLSelectElement.cpp @@ -99,17 +99,17 @@ SafeOptionListMutation::~SafeOptionListM // // construction, destruction HTMLSelectElement::HTMLSelectElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo, FromParser aFromParser) : nsGenericHTMLFormElementWithState(aNodeInfo), - mOptions(new HTMLOptionsCollection(MOZ_THIS_IN_INITIALIZER_LIST())), + mOptions(new HTMLOptionsCollection(this)), mAutocompleteAttrState(nsContentUtils::eAutocompleteAttrState_Unknown), mIsDoneAddingChildren(!aFromParser), mDisabledChanged(false), mMutating(false), mInhibitStateRestoration(!!(aFromParser & FROM_PARSER_FRAGMENT)), mSelectionHasChanged(false), mDefaultSelectionSet(false), mCanShowInvalidUI(true),
--- a/dom/html/HTMLTextAreaElement.cpp +++ b/dom/html/HTMLTextAreaElement.cpp @@ -56,17 +56,17 @@ HTMLTextAreaElement::HTMLTextAreaElement : nsGenericHTMLFormElementWithState(aNodeInfo), mValueChanged(false), mHandlingSelect(false), mDoneAddingChildren(!aFromParser), mInhibitStateRestoration(!!(aFromParser & FROM_PARSER_FRAGMENT)), mDisabledChanged(false), mCanShowInvalidUI(true), mCanShowValidUI(true), - mState(MOZ_THIS_IN_INITIALIZER_LIST()) + mState(this) { AddMutationObserver(this); // Set up our default state. By default we're enabled (since we're // a control type that can be disabled but not actually disabled // right now), optional, and valid. We are NOT readwrite by default // until someone calls UpdateEditableState on us, apparently! Also // by default we don't have to show validity UI and so forth.
--- a/dom/media/AudioStream.cpp +++ b/dom/media/AudioStream.cpp @@ -127,17 +127,17 @@ private: AudioStream::AudioStream() : mMonitor("AudioStream") , mInRate(0) , mOutRate(0) , mChannels(0) , mOutChannels(0) , mWritten(0) - , mAudioClock(MOZ_THIS_IN_INITIALIZER_LIST()) + , mAudioClock(this) , mLatencyRequest(HighLatency) , mReadPoint(0) , mDumpFile(nullptr) , mBytesPerFrame(0) , mState(INITIALIZED) , mNeedsStart(false) , mShouldDropFrames(false) , mPendingAudioInitTask(false)
--- a/dom/media/MediaDecoderStateMachine.cpp +++ b/dom/media/MediaDecoderStateMachine.cpp @@ -176,18 +176,17 @@ static int64_t DurationToUsecs(TimeDurat } MediaDecoderStateMachine::MediaDecoderStateMachine(MediaDecoder* aDecoder, MediaDecoderReader* aReader, bool aRealTime) : mDecoder(aDecoder), mScheduler(new MediaDecoderStateMachineScheduler( aDecoder->GetReentrantMonitor(), - &MediaDecoderStateMachine::TimeoutExpired, - MOZ_THIS_IN_INITIALIZER_LIST(), aRealTime)), + &MediaDecoderStateMachine::TimeoutExpired, this, aRealTime)), mState(DECODER_STATE_DECODING_NONE), mSyncPointInMediaStream(-1), mSyncPointInDecodedStream(-1), mPlayDuration(0), mStartTime(-1), mEndTime(-1), mFragmentEndTime(-1), mReader(aReader), @@ -1826,17 +1825,16 @@ MediaDecoderStateMachine::DispatchDecode if (needToDecodeAudio) { EnsureAudioDecodeTaskQueued(); } if (needToDecodeVideo) { EnsureVideoDecodeTaskQueued(); } - if (needIdle) { RefPtr<nsIRunnable> event = NS_NewRunnableMethod( this, &MediaDecoderStateMachine::SetReaderIdle); nsresult rv = DecodeTaskQueue()->Dispatch(event.forget()); if (NS_FAILED(rv) && mState != DECODER_STATE_SHUTDOWN) { DECODER_WARN("Failed to dispatch event to set decoder idle state"); } }
--- a/dom/media/MediaResource.cpp +++ b/dom/media/MediaResource.cpp @@ -75,17 +75,17 @@ NS_IMPL_QUERY_INTERFACE0(MediaResource) ChannelMediaResource::ChannelMediaResource(MediaDecoder* aDecoder, nsIChannel* aChannel, nsIURI* aURI, const nsACString& aContentType) : BaseMediaResource(aDecoder, aChannel, aURI, aContentType), mOffset(0), mSuspendCount(0), mReopenOnError(false), mIgnoreClose(false), - mCacheStream(MOZ_THIS_IN_INITIALIZER_LIST()), + mCacheStream(this), mLock("ChannelMediaResource.mLock"), mIgnoreResume(false), mIsTransportSeekable(true) { #ifdef PR_LOGGING if (!gMediaResourceLog) { gMediaResourceLog = PR_NewLogModule("MediaResource"); }
--- a/dom/media/MediaStreamGraph.cpp +++ b/dom/media/MediaStreamGraph.cpp @@ -2737,17 +2737,17 @@ MediaStreamGraphImpl::MediaStreamGraphIm , mRealtime(aRealtime) , mNonRealtimeProcessing(false) , mStreamOrderDirty(false) , mLatencyLog(AsyncLatencyLogger::Get()) #ifdef MOZ_WEBRTC , mFarendObserverRef(nullptr) #endif , mMemoryReportMonitor("MSGIMemory") - , mSelfRef(MOZ_THIS_IN_INITIALIZER_LIST()) + , mSelfRef(this) , mAudioStreamSizes() , mNeedsMemoryReport(false) #ifdef DEBUG , mCanRunMessagesSynchronously(false) #endif , mAudioChannel(static_cast<uint32_t>(aChannel)) { #ifdef PR_LOGGING
--- a/dom/media/gmp/GMPVideoDecoderChild.cpp +++ b/dom/media/gmp/GMPVideoDecoderChild.cpp @@ -12,17 +12,17 @@ namespace mozilla { namespace gmp { GMPVideoDecoderChild::GMPVideoDecoderChild(GMPChild* aPlugin) : GMPSharedMemManager(aPlugin), mPlugin(aPlugin), mVideoDecoder(nullptr), - mVideoHost(MOZ_THIS_IN_INITIALIZER_LIST()) + mVideoHost(this) { MOZ_ASSERT(mPlugin); } GMPVideoDecoderChild::~GMPVideoDecoderChild() { }
--- a/dom/media/gmp/GMPVideoDecoderParent.cpp +++ b/dom/media/gmp/GMPVideoDecoderParent.cpp @@ -43,17 +43,17 @@ namespace gmp { // Dead: mIsOpen == false GMPVideoDecoderParent::GMPVideoDecoderParent(GMPParent* aPlugin) : GMPSharedMemManager(aPlugin) , mIsOpen(false) , mShuttingDown(false) , mPlugin(aPlugin) , mCallback(nullptr) - , mVideoHost(MOZ_THIS_IN_INITIALIZER_LIST()) + , mVideoHost(this) { MOZ_ASSERT(mPlugin); } GMPVideoDecoderParent::~GMPVideoDecoderParent() { }
--- a/dom/media/gmp/GMPVideoEncoderChild.cpp +++ b/dom/media/gmp/GMPVideoEncoderChild.cpp @@ -12,17 +12,17 @@ namespace mozilla { namespace gmp { GMPVideoEncoderChild::GMPVideoEncoderChild(GMPChild* aPlugin) : GMPSharedMemManager(aPlugin), mPlugin(aPlugin), mVideoEncoder(nullptr), - mVideoHost(MOZ_THIS_IN_INITIALIZER_LIST()) + mVideoHost(this) { MOZ_ASSERT(mPlugin); } GMPVideoEncoderChild::~GMPVideoEncoderChild() { }
--- a/dom/media/gmp/GMPVideoEncoderParent.cpp +++ b/dom/media/gmp/GMPVideoEncoderParent.cpp @@ -50,17 +50,17 @@ namespace gmp { // Dead: mIsOpen == false GMPVideoEncoderParent::GMPVideoEncoderParent(GMPParent *aPlugin) : GMPSharedMemManager(aPlugin), mIsOpen(false), mShuttingDown(false), mPlugin(aPlugin), mCallback(nullptr), - mVideoHost(MOZ_THIS_IN_INITIALIZER_LIST()) + mVideoHost(this) { MOZ_ASSERT(mPlugin); nsresult rv = NS_NewNamedThread("GMPEncoded", getter_AddRefs(mEncodedThread)); if (NS_FAILED(rv)) { MOZ_CRASH(); } }
--- a/dom/media/webaudio/AudioBufferSourceNode.cpp +++ b/dom/media/webaudio/AudioBufferSourceNode.cpp @@ -536,18 +536,17 @@ public: AudioBufferSourceNode::AudioBufferSourceNode(AudioContext* aContext) : AudioNode(aContext, 2, ChannelCountMode::Max, ChannelInterpretation::Speakers) , mLoopStart(0.0) , mLoopEnd(0.0) // mOffset and mDuration are initialized in Start(). - , mPlaybackRate(new AudioParam(MOZ_THIS_IN_INITIALIZER_LIST(), - SendPlaybackRateToStream, 1.0f)) + , mPlaybackRate(new AudioParam(this, SendPlaybackRateToStream, 1.0f)) , mLoop(false) , mStartCalled(false) , mStopped(false) { AudioBufferSourceNodeEngine* engine = new AudioBufferSourceNodeEngine(this, aContext->Destination()); mStream = aContext->Graph()->CreateAudioNodeStream(engine, MediaStreamGraph::SOURCE_STREAM); engine->SetSourceStream(static_cast<AudioNodeStream*>(mStream.get())); mStream->AddMainThreadListener(this);
--- a/dom/media/webaudio/BiquadFilterNode.cpp +++ b/dom/media/webaudio/BiquadFilterNode.cpp @@ -239,24 +239,20 @@ private: }; BiquadFilterNode::BiquadFilterNode(AudioContext* aContext) : AudioNode(aContext, 2, ChannelCountMode::Max, ChannelInterpretation::Speakers) , mType(BiquadFilterType::Lowpass) - , mFrequency(new AudioParam(MOZ_THIS_IN_INITIALIZER_LIST(), - SendFrequencyToStream, 350.f)) - , mDetune(new AudioParam(MOZ_THIS_IN_INITIALIZER_LIST(), - SendDetuneToStream, 0.f)) - , mQ(new AudioParam(MOZ_THIS_IN_INITIALIZER_LIST(), - SendQToStream, 1.f)) - , mGain(new AudioParam(MOZ_THIS_IN_INITIALIZER_LIST(), - SendGainToStream, 0.f)) + , mFrequency(new AudioParam(this, SendFrequencyToStream, 350.f)) + , mDetune(new AudioParam(this, SendDetuneToStream, 0.f)) + , mQ(new AudioParam(this, SendQToStream, 1.f)) + , mGain(new AudioParam(this, SendGainToStream, 0.f)) { BiquadFilterNodeEngine* engine = new BiquadFilterNodeEngine(this, aContext->Destination()); mStream = aContext->Graph()->CreateAudioNodeStream(engine, MediaStreamGraph::INTERNAL_STREAM); engine->SetSourceStream(static_cast<AudioNodeStream*> (mStream.get())); } BiquadFilterNode::~BiquadFilterNode() { @@ -367,9 +363,8 @@ void BiquadFilterNode::SendGainToStream(AudioNode* aNode) { BiquadFilterNode* This = static_cast<BiquadFilterNode*>(aNode); SendTimelineParameterToStream(This, BiquadFilterNodeEngine::GAIN, *This->mGain); } } } -
--- a/dom/media/webaudio/DelayNode.cpp +++ b/dom/media/webaudio/DelayNode.cpp @@ -185,18 +185,17 @@ public: int32_t mLeftOverData; }; DelayNode::DelayNode(AudioContext* aContext, double aMaxDelay) : AudioNode(aContext, 2, ChannelCountMode::Max, ChannelInterpretation::Speakers) - , mDelay(new AudioParam(MOZ_THIS_IN_INITIALIZER_LIST(), - SendDelayToStream, 0.0f)) + , mDelay(new AudioParam(this, SendDelayToStream, 0.0f)) { DelayNodeEngine* engine = new DelayNodeEngine(this, aContext->Destination(), aContext->SampleRate() * aMaxDelay); mStream = aContext->Graph()->CreateAudioNodeStream(engine, MediaStreamGraph::INTERNAL_STREAM); engine->SetSourceStream(static_cast<AudioNodeStream*> (mStream.get())); } @@ -228,9 +227,8 @@ void DelayNode::SendDelayToStream(AudioNode* aNode) { DelayNode* This = static_cast<DelayNode*>(aNode); SendTimelineParameterToStream(This, DelayNodeEngine::DELAY, *This->mDelay); } } } -
--- a/dom/media/webaudio/DynamicsCompressorNode.cpp +++ b/dom/media/webaudio/DynamicsCompressorNode.cpp @@ -199,28 +199,22 @@ private: nsAutoPtr<DynamicsCompressor> mCompressor; }; DynamicsCompressorNode::DynamicsCompressorNode(AudioContext* aContext) : AudioNode(aContext, 2, ChannelCountMode::Explicit, ChannelInterpretation::Speakers) - , mThreshold(new AudioParam(MOZ_THIS_IN_INITIALIZER_LIST(), - SendThresholdToStream, -24.f)) - , mKnee(new AudioParam(MOZ_THIS_IN_INITIALIZER_LIST(), - SendKneeToStream, 30.f)) - , mRatio(new AudioParam(MOZ_THIS_IN_INITIALIZER_LIST(), - SendRatioToStream, 12.f)) - , mReduction(new AudioParam(MOZ_THIS_IN_INITIALIZER_LIST(), - Callback, 0.f)) - , mAttack(new AudioParam(MOZ_THIS_IN_INITIALIZER_LIST(), - SendAttackToStream, 0.003f)) - , mRelease(new AudioParam(MOZ_THIS_IN_INITIALIZER_LIST(), - SendReleaseToStream, 0.25f)) + , mThreshold(new AudioParam(this, SendThresholdToStream, -24.f)) + , mKnee(new AudioParam(this, SendKneeToStream, 30.f)) + , mRatio(new AudioParam(this, SendRatioToStream, 12.f)) + , mReduction(new AudioParam(this, Callback, 0.f)) + , mAttack(new AudioParam(this, SendAttackToStream, 0.003f)) + , mRelease(new AudioParam(this, SendReleaseToStream, 0.25f)) { DynamicsCompressorNodeEngine* engine = new DynamicsCompressorNodeEngine(this, aContext->Destination()); mStream = aContext->Graph()->CreateAudioNodeStream(engine, MediaStreamGraph::INTERNAL_STREAM); engine->SetSourceStream(static_cast<AudioNodeStream*> (mStream.get())); } DynamicsCompressorNode::~DynamicsCompressorNode() { @@ -282,9 +276,8 @@ void DynamicsCompressorNode::SendReleaseToStream(AudioNode* aNode) { DynamicsCompressorNode* This = static_cast<DynamicsCompressorNode*>(aNode); SendTimelineParameterToStream(This, DynamicsCompressorNodeEngine::RELEASE, *This->mRelease); } } } -
--- a/dom/media/webaudio/GainNode.cpp +++ b/dom/media/webaudio/GainNode.cpp @@ -120,18 +120,17 @@ public: AudioParamTimeline mGain; }; GainNode::GainNode(AudioContext* aContext) : AudioNode(aContext, 2, ChannelCountMode::Max, ChannelInterpretation::Speakers) - , mGain(new AudioParam(MOZ_THIS_IN_INITIALIZER_LIST(), - SendGainToStream, 1.0f)) + , mGain(new AudioParam(this, SendGainToStream, 1.0f)) { GainNodeEngine* engine = new GainNodeEngine(this, aContext->Destination()); mStream = aContext->Graph()->CreateAudioNodeStream(engine, MediaStreamGraph::INTERNAL_STREAM); engine->SetSourceStream(static_cast<AudioNodeStream*> (mStream.get())); } GainNode::~GainNode() { @@ -161,9 +160,8 @@ void GainNode::SendGainToStream(AudioNode* aNode) { GainNode* This = static_cast<GainNode*>(aNode); SendTimelineParameterToStream(This, GainNodeEngine::GAIN, *This->mGain); } } } -
--- a/dom/media/webaudio/MediaStreamAudioDestinationNode.cpp +++ b/dom/media/webaudio/MediaStreamAudioDestinationNode.cpp @@ -63,17 +63,17 @@ static bool FilterAudioNodeStreamTrack(S } MediaStreamAudioDestinationNode::MediaStreamAudioDestinationNode(AudioContext* aContext) : AudioNode(aContext, 2, ChannelCountMode::Explicit, ChannelInterpretation::Speakers) , mDOMStream(DOMAudioNodeMediaStream::CreateTrackUnionStream(GetOwner(), - MOZ_THIS_IN_INITIALIZER_LIST(), + this, DOMMediaStream::HINT_CONTENTS_AUDIO)) { TrackUnionStream* tus = static_cast<TrackUnionStream*>(mDOMStream->GetStream()); MOZ_ASSERT(tus == mDOMStream->GetStream()->AsProcessedStream()); tus->SetTrackIDFilter(FilterAudioNodeStreamTrack); MediaStreamDestinationEngine* engine = new MediaStreamDestinationEngine(this, tus); mStream = aContext->Graph()->CreateAudioNodeStream(engine, MediaStreamGraph::INTERNAL_STREAM);
--- a/dom/media/webaudio/OscillatorNode.cpp +++ b/dom/media/webaudio/OscillatorNode.cpp @@ -376,20 +376,18 @@ public: }; OscillatorNode::OscillatorNode(AudioContext* aContext) : AudioNode(aContext, 2, ChannelCountMode::Max, ChannelInterpretation::Speakers) , mType(OscillatorType::Sine) - , mFrequency(new AudioParam(MOZ_THIS_IN_INITIALIZER_LIST(), - SendFrequencyToStream, 440.0f)) - , mDetune(new AudioParam(MOZ_THIS_IN_INITIALIZER_LIST(), - SendDetuneToStream, 0.0f)) + , mFrequency(new AudioParam(this, SendFrequencyToStream, 440.0f)) + , mDetune(new AudioParam(this, SendDetuneToStream, 0.0f)) , mStartCalled(false) , mStopped(false) { OscillatorNodeEngine* engine = new OscillatorNodeEngine(this, aContext->Destination()); mStream = aContext->Graph()->CreateAudioNodeStream(engine, MediaStreamGraph::SOURCE_STREAM); engine->SetSourceStream(static_cast<AudioNodeStream*> (mStream.get())); mStream->AddMainThreadListener(this); } @@ -545,9 +543,8 @@ OscillatorNode::NotifyMainThreadStateCha // Drop the playing reference // Warning: The below line might delete this. MarkInactive(); } } } } -
--- a/dom/media/webaudio/StereoPannerNode.cpp +++ b/dom/media/webaudio/StereoPannerNode.cpp @@ -171,18 +171,17 @@ public: AudioParamTimeline mPan; }; StereoPannerNode::StereoPannerNode(AudioContext* aContext) : AudioNode(aContext, 2, ChannelCountMode::Clamped_max, ChannelInterpretation::Speakers) - , mPan(new AudioParam(MOZ_THIS_IN_INITIALIZER_LIST(), - SendPanToStream, 0.f)) + , mPan(new AudioParam(this, SendPanToStream, 0.f)) { StereoPannerNodeEngine* engine = new StereoPannerNodeEngine(this, aContext->Destination()); mStream = aContext->Graph()->CreateAudioNodeStream(engine, MediaStreamGraph::INTERNAL_STREAM); engine->SetSourceStream(static_cast<AudioNodeStream*>(mStream.get())); } StereoPannerNode::~StereoPannerNode() @@ -213,9 +212,8 @@ void StereoPannerNode::SendPanToStream(AudioNode* aNode) { StereoPannerNode* This = static_cast<StereoPannerNode*>(aNode); SendTimelineParameterToStream(This, StereoPannerNodeEngine::PAN, *This->mPan); } } } -
--- a/dom/plugins/ipc/BrowserStreamChild.cpp +++ b/dom/plugins/ipc/BrowserStreamChild.cpp @@ -23,17 +23,17 @@ BrowserStreamChild::BrowserStreamChild(P , mDestroyPending(NOT_DESTROYED) , mNotifyPending(false) , mStreamAsFilePending(false) , mInstanceDying(false) , mState(CONSTRUCTING) , mURL(url) , mHeaders(headers) , mStreamNotify(notifyData) - , mDeliveryTracker(MOZ_THIS_IN_INITIALIZER_LIST()) + , mDeliveryTracker(this) { PLUGIN_LOG_DEBUG(("%s (%s, %i, %i, %p, %s)", FULLFUNCTION, url.get(), length, lastmodified, (void*) notifyData, headers.get())); AssertPluginThread(); memset(&mStream, 0, sizeof(mStream));
--- a/dom/plugins/ipc/PluginModuleParent.cpp +++ b/dom/plugins/ipc/PluginModuleParent.cpp @@ -483,17 +483,17 @@ PluginModuleChromeParent::WaitForIPCConn PluginModuleParent::PluginModuleParent(bool aIsChrome) : mIsChrome(aIsChrome) , mShutdown(false) , mClearSiteDataSupported(false) , mGetSitesWithDataSupported(false) , mNPNIface(nullptr) , mPlugin(nullptr) - , mTaskFactory(MOZ_THIS_IN_INITIALIZER_LIST()) + , mTaskFactory(this) , mIsStartingAsync(false) , mNPInitialized(false) , mAsyncNewRv(NS_ERROR_NOT_INITIALIZED) , mAsyncInitPluginFuncs(nullptr) { #if defined(XP_WIN) || defined(XP_MACOSX) || defined(MOZ_WIDGET_GTK) mIsStartingAsync = Preferences::GetBool(kAsyncInitPref, false); #endif @@ -516,17 +516,17 @@ PluginModuleContentParent::PluginModuleC : PluginModuleParent(false) { } PluginModuleChromeParent::PluginModuleChromeParent(const char* aFilePath, uint32_t aPluginId) : PluginModuleParent(true) , mSubprocess(new PluginProcessParent(aFilePath)) , mPluginId(aPluginId) - , mChromeTaskFactory(MOZ_THIS_IN_INITIALIZER_LIST()) + , mChromeTaskFactory(this) , mHangAnnotationFlags(0) #ifdef XP_WIN , mPluginCpuUsageOnHang() , mHangUIParent(nullptr) , mHangUIEnabled(true) , mIsTimerReset(true) #ifdef MOZ_CRASHREPORTER , mCrashReporterMutex("PluginModuleParent::mCrashReporterMutex")
--- a/dom/smil/nsSMILTimeValueSpec.cpp +++ b/dom/smil/nsSMILTimeValueSpec.cpp @@ -36,17 +36,17 @@ nsSMILTimeValueSpec::EventListener::Hand //---------------------------------------------------------------------- // Implementation nsSMILTimeValueSpec::nsSMILTimeValueSpec(nsSMILTimedElement& aOwner, bool aIsBegin) : mOwner(&aOwner), mIsBegin(aIsBegin), - mReferencedElement(MOZ_THIS_IN_INITIALIZER_LIST()) + mReferencedElement(this) { } nsSMILTimeValueSpec::~nsSMILTimeValueSpec() { UnregisterFromReferencedElement(mReferencedElement.get()); if (mEventListener) { mEventListener->Disconnect();
--- a/dom/svg/SVGAElement.cpp +++ b/dom/svg/SVGAElement.cpp @@ -59,17 +59,17 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_END NS_IMPL_ADDREF_INHERITED(SVGAElement, SVGAElementBase) NS_IMPL_RELEASE_INHERITED(SVGAElement, SVGAElementBase) //---------------------------------------------------------------------- // Implementation SVGAElement::SVGAElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo) : SVGAElementBase(aNodeInfo) - , Link(MOZ_THIS_IN_INITIALIZER_LIST()) + , Link(this) { } SVGAElement::~SVGAElement() { } already_AddRefed<SVGAnimatedString>
--- a/dom/svg/SVGAnimationElement.cpp +++ b/dom/svg/SVGAnimationElement.cpp @@ -29,17 +29,17 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(SVGAn SVGAnimationElementBase, mHrefTarget, mTimedElement) //---------------------------------------------------------------------- // Implementation SVGAnimationElement::SVGAnimationElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo) : SVGAnimationElementBase(aNodeInfo), - mHrefTarget(MOZ_THIS_IN_INITIALIZER_LIST()) + mHrefTarget(this) { } SVGAnimationElement::~SVGAnimationElement() { } nsresult
--- a/dom/svg/SVGMPathElement.cpp +++ b/dom/svg/SVGMPathElement.cpp @@ -52,17 +52,17 @@ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION NS_INTERFACE_TABLE_INHERITED(SVGMPathElement, nsIDOMNode, nsIDOMElement, nsIDOMSVGElement, nsIMutationObserver) NS_INTERFACE_TABLE_TAIL_INHERITING(SVGMPathElementBase) // Constructor SVGMPathElement::SVGMPathElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo) : SVGMPathElementBase(aNodeInfo), - mHrefTarget(MOZ_THIS_IN_INITIALIZER_LIST()) + mHrefTarget(this) { } SVGMPathElement::~SVGMPathElement() { UnlinkHrefTarget(false); }
--- a/dom/svg/SVGUseElement.cpp +++ b/dom/svg/SVGUseElement.cpp @@ -67,17 +67,17 @@ NS_IMPL_RELEASE_INHERITED(SVGUseElement, NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(SVGUseElement) NS_INTERFACE_TABLE_INHERITED(SVGUseElement, nsIMutationObserver) NS_INTERFACE_TABLE_TAIL_INHERITING(SVGUseElementBase) //---------------------------------------------------------------------- // Implementation SVGUseElement::SVGUseElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo) - : SVGUseElementBase(aNodeInfo), mSource(MOZ_THIS_IN_INITIALIZER_LIST()) + : SVGUseElementBase(aNodeInfo), mSource(this) { } SVGUseElement::~SVGUseElement() { UnlinkSource(); }
--- a/gfx/layers/apz/src/AsyncPanZoomController.cpp +++ b/gfx/layers/apz/src/AsyncPanZoomController.cpp @@ -889,18 +889,18 @@ AsyncPanZoomController::AsyncPanZoomCont GeckoContentController* aGeckoContentController, GestureBehavior aGestures) : mLayersId(aLayersId), mPaintThrottler(GetFrameTime(), TimeDuration::FromMilliseconds(500)), mGeckoContentController(aGeckoContentController), mRefPtrMonitor("RefPtrMonitor"), mSharingFrameMetricsAcrossProcesses(false), mMonitor("AsyncPanZoomController"), - mX(MOZ_THIS_IN_INITIALIZER_LIST()), - mY(MOZ_THIS_IN_INITIALIZER_LIST()), + mX(this), + mY(this), mPanDirRestricted(false), mZoomConstraints(false, false, MIN_ZOOM, MAX_ZOOM), mLastSampleTime(GetFrameTime()), mLastAsyncScrollTime(GetFrameTime()), mLastAsyncScrollOffset(0, 0), mCurrentAsyncScrollOffset(0, 0), mAsyncScrollTimeoutTask(nullptr), mState(NOTHING),
--- a/gfx/layers/basic/BasicCanvasLayer.h +++ b/gfx/layers/basic/BasicCanvasLayer.h @@ -18,31 +18,30 @@ class gfxContext; namespace mozilla { namespace layers { class BasicCanvasLayer : public CopyableCanvasLayer, public BasicImplData { public: explicit BasicCanvasLayer(BasicLayerManager* aLayerManager) : - CopyableCanvasLayer(aLayerManager, - static_cast<BasicImplData*>(MOZ_THIS_IN_INITIALIZER_LIST())) + CopyableCanvasLayer(aLayerManager, static_cast<BasicImplData*>(this)) { } - + virtual void SetVisibleRegion(const nsIntRegion& aRegion) MOZ_OVERRIDE { NS_ASSERTION(BasicManager()->InConstruction(), "Can only set properties in construction phase"); CanvasLayer::SetVisibleRegion(aRegion); } - + virtual void Paint(gfx::DrawTarget* aDT, const gfx::Point& aDeviceOffset, Layer* aMaskLayer) MOZ_OVERRIDE; - + protected: BasicLayerManager* BasicManager() { return static_cast<BasicLayerManager*>(mManager); } }; }
--- a/gfx/layers/basic/BasicColorLayer.cpp +++ b/gfx/layers/basic/BasicColorLayer.cpp @@ -22,18 +22,17 @@ using namespace mozilla::gfx; namespace mozilla { namespace layers { class BasicColorLayer : public ColorLayer, public BasicImplData { public: explicit BasicColorLayer(BasicLayerManager* aLayerManager) : - ColorLayer(aLayerManager, - static_cast<BasicImplData*>(MOZ_THIS_IN_INITIALIZER_LIST())) + ColorLayer(aLayerManager, static_cast<BasicImplData*>(this)) { MOZ_COUNT_CTOR(BasicColorLayer); } protected: virtual ~BasicColorLayer() { MOZ_COUNT_DTOR(BasicColorLayer);
--- a/gfx/layers/basic/BasicContainerLayer.h +++ b/gfx/layers/basic/BasicContainerLayer.h @@ -15,18 +15,17 @@ struct nsIntRect; namespace mozilla { namespace layers { class BasicContainerLayer : public ContainerLayer, public BasicImplData { public: explicit BasicContainerLayer(BasicLayerManager* aManager) : - ContainerLayer(aManager, - static_cast<BasicImplData*>(MOZ_THIS_IN_INITIALIZER_LIST())) + ContainerLayer(aManager, static_cast<BasicImplData*>(this)) { MOZ_COUNT_CTOR(BasicContainerLayer); mSupportsComponentAlphaChildren = true; } protected: virtual ~BasicContainerLayer(); public:
--- a/gfx/layers/basic/BasicImageLayer.cpp +++ b/gfx/layers/basic/BasicImageLayer.cpp @@ -21,18 +21,17 @@ using namespace mozilla::gfx; namespace mozilla { namespace layers { class BasicImageLayer : public ImageLayer, public BasicImplData { public: explicit BasicImageLayer(BasicLayerManager* aLayerManager) : - ImageLayer(aLayerManager, - static_cast<BasicImplData*>(MOZ_THIS_IN_INITIALIZER_LIST())), + ImageLayer(aLayerManager, static_cast<BasicImplData*>(this)), mSize(-1, -1) { MOZ_COUNT_CTOR(BasicImageLayer); } protected: virtual ~BasicImageLayer() { MOZ_COUNT_DTOR(BasicImageLayer);
--- a/gfx/layers/basic/BasicLayersImpl.h +++ b/gfx/layers/basic/BasicLayersImpl.h @@ -45,18 +45,17 @@ private: nsRefPtr<gfxContext> mContext; }; class BasicReadbackLayer : public ReadbackLayer, public BasicImplData { public: explicit BasicReadbackLayer(BasicLayerManager* aLayerManager) : - ReadbackLayer(aLayerManager, - static_cast<BasicImplData*>(MOZ_THIS_IN_INITIALIZER_LIST())) + ReadbackLayer(aLayerManager, static_cast<BasicImplData*>(this)) { MOZ_COUNT_CTOR(BasicReadbackLayer); } protected: virtual ~BasicReadbackLayer() { MOZ_COUNT_DTOR(BasicReadbackLayer);
--- a/gfx/layers/basic/BasicPaintedLayer.h +++ b/gfx/layers/basic/BasicPaintedLayer.h @@ -26,18 +26,17 @@ namespace layers { class ReadbackProcessor; class BasicPaintedLayer : public PaintedLayer, public BasicImplData { public: typedef RotatedContentBuffer::PaintState PaintState; typedef RotatedContentBuffer::ContentType ContentType; explicit BasicPaintedLayer(BasicLayerManager* aLayerManager) : - PaintedLayer(aLayerManager, - static_cast<BasicImplData*>(MOZ_THIS_IN_INITIALIZER_LIST())), + PaintedLayer(aLayerManager, static_cast<BasicImplData*>(this)), mContentClient(nullptr) { MOZ_COUNT_CTOR(BasicPaintedLayer); } protected: virtual ~BasicPaintedLayer() {
--- a/gfx/layers/client/ClientCanvasLayer.h +++ b/gfx/layers/client/ClientCanvasLayer.h @@ -31,18 +31,17 @@ class CompositableClient; class ShadowableLayer; class ClientCanvasLayer : public CopyableCanvasLayer, public ClientLayer { typedef CanvasClient::CanvasClientType CanvasClientType; public: explicit ClientCanvasLayer(ClientLayerManager* aLayerManager) : - CopyableCanvasLayer(aLayerManager, - static_cast<ClientLayer*>(MOZ_THIS_IN_INITIALIZER_LIST())) + CopyableCanvasLayer(aLayerManager, static_cast<ClientLayer*>(this)) { MOZ_COUNT_CTOR(ClientCanvasLayer); } protected: virtual ~ClientCanvasLayer(); public:
--- a/gfx/layers/client/ClientColorLayer.cpp +++ b/gfx/layers/client/ClientColorLayer.cpp @@ -13,22 +13,21 @@ #include "nsISupportsImpl.h" // for Layer::AddRef, etc #include "nsRegion.h" // for nsIntRegion namespace mozilla { namespace layers { using namespace mozilla::gfx; -class ClientColorLayer : public ColorLayer, +class ClientColorLayer : public ColorLayer, public ClientLayer { public: explicit ClientColorLayer(ClientLayerManager* aLayerManager) : - ColorLayer(aLayerManager, - static_cast<ClientLayer*>(MOZ_THIS_IN_INITIALIZER_LIST())) + ColorLayer(aLayerManager, static_cast<ClientLayer*>(this)) { MOZ_COUNT_CTOR(ClientColorLayer); } protected: virtual ~ClientColorLayer() { MOZ_COUNT_DTOR(ClientColorLayer);
--- a/gfx/layers/client/ClientContainerLayer.h +++ b/gfx/layers/client/ClientContainerLayer.h @@ -23,18 +23,17 @@ namespace layers { class ShadowableLayer; class ClientContainerLayer : public ContainerLayer, public ClientLayer { public: explicit ClientContainerLayer(ClientLayerManager* aManager) : - ContainerLayer(aManager, - static_cast<ClientLayer*>(MOZ_THIS_IN_INITIALIZER_LIST())) + ContainerLayer(aManager, static_cast<ClientLayer*>(this)) { MOZ_COUNT_CTOR(ClientContainerLayer); mSupportsComponentAlphaChildren = true; } protected: virtual ~ClientContainerLayer() { @@ -146,18 +145,17 @@ protected: return static_cast<ClientLayerManager*>(mManager); } }; class ClientRefLayer : public RefLayer, public ClientLayer { public: explicit ClientRefLayer(ClientLayerManager* aManager) : - RefLayer(aManager, - static_cast<ClientLayer*>(MOZ_THIS_IN_INITIALIZER_LIST())) + RefLayer(aManager, static_cast<ClientLayer*>(this)) { MOZ_COUNT_CTOR(ClientRefLayer); } protected: virtual ~ClientRefLayer() { MOZ_COUNT_DTOR(ClientRefLayer);
--- a/gfx/layers/client/ClientImageLayer.cpp +++ b/gfx/layers/client/ClientImageLayer.cpp @@ -18,22 +18,21 @@ #include "nsISupportsImpl.h" // for Layer::AddRef, etc #include "nsRegion.h" // for nsIntRegion namespace mozilla { namespace layers { using namespace mozilla::gfx; -class ClientImageLayer : public ImageLayer, +class ClientImageLayer : public ImageLayer, public ClientLayer { public: explicit ClientImageLayer(ClientLayerManager* aLayerManager) - : ImageLayer(aLayerManager, - static_cast<ClientLayer*>(MOZ_THIS_IN_INITIALIZER_LIST())) + : ImageLayer(aLayerManager, static_cast<ClientLayer*>(this)) , mImageClientTypeContainer(CompositableType::UNKNOWN) { MOZ_COUNT_CTOR(ClientImageLayer); } protected: virtual ~ClientImageLayer() { @@ -177,10 +176,11 @@ already_AddRefed<ImageLayer> ClientLayerManager::CreateImageLayer() { NS_ASSERTION(InConstruction(), "Only allowed in construction phase"); nsRefPtr<ClientImageLayer> layer = new ClientImageLayer(this); CREATE_SHADOW(Image); return layer.forget(); } + } }
--- a/gfx/layers/client/ClientPaintedLayer.h +++ b/gfx/layers/client/ClientPaintedLayer.h @@ -30,19 +30,17 @@ class SpecificLayerAttributes; class ClientPaintedLayer : public PaintedLayer, public ClientLayer { public: typedef RotatedContentBuffer::PaintState PaintState; typedef RotatedContentBuffer::ContentType ContentType; explicit ClientPaintedLayer(ClientLayerManager* aLayerManager, LayerManager::PaintedLayerCreationHint aCreationHint = LayerManager::NONE) : - PaintedLayer(aLayerManager, - static_cast<ClientLayer*>(MOZ_THIS_IN_INITIALIZER_LIST()), - aCreationHint), + PaintedLayer(aLayerManager, static_cast<ClientLayer*>(this), aCreationHint), mContentClient(nullptr) { MOZ_COUNT_CTOR(ClientPaintedLayer); } protected: virtual ~ClientPaintedLayer() {
--- a/gfx/layers/client/ClientTiledPaintedLayer.cpp +++ b/gfx/layers/client/ClientTiledPaintedLayer.cpp @@ -21,19 +21,17 @@ #include "nsRect.h" // for nsIntRect #include "LayersLogging.h" namespace mozilla { namespace layers { ClientTiledPaintedLayer::ClientTiledPaintedLayer(ClientLayerManager* const aManager, ClientLayerManager::PaintedLayerCreationHint aCreationHint) - : PaintedLayer(aManager, - static_cast<ClientLayer*>(MOZ_THIS_IN_INITIALIZER_LIST()), - aCreationHint) + : PaintedLayer(aManager, static_cast<ClientLayer*>(this), aCreationHint) , mContentClient() { MOZ_COUNT_CTOR(ClientTiledPaintedLayer); mPaintData.mLastScrollOffset = ParentLayerPoint(0, 0); mPaintData.mFirstPaint = true; } ClientTiledPaintedLayer::~ClientTiledPaintedLayer()
--- a/gfx/thebes/gfxPlatform.cpp +++ b/gfx/thebes/gfxPlatform.cpp @@ -371,18 +371,17 @@ static const char *gPrefLangNames[] = { "x-sinh", "x-tibt", "x-unicode", }; gfxPlatform::gfxPlatform() : mTileWidth(-1) , mTileHeight(-1) - , mAzureCanvasBackendCollector(MOZ_THIS_IN_INITIALIZER_LIST(), - &gfxPlatform::GetAzureBackendInfo) + , mAzureCanvasBackendCollector(this, &gfxPlatform::GetAzureBackendInfo) { mAllowDownloadableFonts = UNINITIALIZED_VALUE; mFallbackUsesCmaps = UNINITIALIZED_VALUE; mWordCacheCharLimit = UNINITIALIZED_VALUE; mWordCacheMaxEntries = UNINITIALIZED_VALUE; mGraphiteShapingEnabled = UNINITIALIZED_VALUE; mOpenTypeSVGEnabled = UNINITIALIZED_VALUE;
--- a/image/src/SurfaceCache.cpp +++ b/image/src/SurfaceCache.cpp @@ -48,17 +48,16 @@ class SurfaceCacheImpl; /////////////////////////////////////////////////////////////////////////////// // Static Data /////////////////////////////////////////////////////////////////////////////// // The single surface cache instance. static StaticRefPtr<SurfaceCacheImpl> sInstance; - /////////////////////////////////////////////////////////////////////////////// // SurfaceCache Implementation /////////////////////////////////////////////////////////////////////////////// /** * Cost models the cost of storing a surface in the cache. Right now, this is * simply an estimate of the size of the surface in bytes, but in the future it * may be worth taking into account the cost of rematerializing the surface as @@ -272,18 +271,17 @@ private: class SurfaceCacheImpl MOZ_FINAL : public nsIMemoryReporter { public: NS_DECL_ISUPPORTS SurfaceCacheImpl(uint32_t aSurfaceCacheExpirationTimeMS, uint32_t aSurfaceCacheDiscardFactor, uint32_t aSurfaceCacheSize) - : mExpirationTracker(MOZ_THIS_IN_INITIALIZER_LIST(), - aSurfaceCacheExpirationTimeMS) + : mExpirationTracker(this, aSurfaceCacheExpirationTimeMS) , mMemoryPressureObserver(new MemoryPressureObserver) , mMutex("SurfaceCache") , mDiscardFactor(aSurfaceCacheDiscardFactor) , mMaxCost(aSurfaceCacheSize) , mAvailableCost(aSurfaceCacheSize) , mLockedCost(0) { nsCOMPtr<nsIObserverService> os = services::GetObserverService(); @@ -699,17 +697,16 @@ private: } return NS_OK; } private: virtual ~MemoryPressureObserver() { } }; - nsTArray<CostEntry> mCosts; nsRefPtrHashtable<nsPtrHashKey<Image>, ImageSurfaceCache> mImageCaches; SurfaceTracker mExpirationTracker; nsRefPtr<MemoryPressureObserver> mMemoryPressureObserver; Mutex mMutex; const uint32_t mDiscardFactor; const Cost mMaxCost; Cost mAvailableCost;
--- a/js/src/ds/LifoAlloc.h +++ b/js/src/ds/LifoAlloc.h @@ -49,17 +49,17 @@ class BumpChunk char *limit; // end of the data BumpChunk *next_; // the next BumpChunk size_t bumpSpaceSize; // size of the data area char *headerBase() { return reinterpret_cast<char *>(this); } char *bumpBase() const { return limit - bumpSpaceSize; } explicit BumpChunk(size_t bumpSpaceSize) - : bump(reinterpret_cast<char *>(MOZ_THIS_IN_INITIALIZER_LIST()) + sizeof(BumpChunk)), + : bump(reinterpret_cast<char *>(this) + sizeof(BumpChunk)), limit(bump + bumpSpaceSize), next_(nullptr), bumpSpaceSize(bumpSpaceSize) { MOZ_ASSERT(bump == AlignPtr(bump)); } void setBump(void *ptr) { MOZ_ASSERT(bumpBase() <= ptr);
--- a/js/src/jit/InlineList.h +++ b/js/src/jit/InlineList.h @@ -241,17 +241,17 @@ class InlineListNode : public InlineForw }; template <typename T> class InlineList : protected InlineListNode<T> { typedef InlineListNode<T> Node; public: - InlineList() : InlineListNode<T>(MOZ_THIS_IN_INITIALIZER_LIST(), MOZ_THIS_IN_INITIALIZER_LIST()) + InlineList() : InlineListNode<T>(this, this) { } public: typedef InlineListIterator<T> iterator; typedef InlineListReverseIterator<T> reverse_iterator; public: iterator begin() const {
--- a/js/src/jscntxt.cpp +++ b/js/src/jscntxt.cpp @@ -1008,17 +1008,17 @@ JSContext::JSContext(JSRuntime *rt) options_(), overRecursed_(false), propagatingForcedReturn_(false), liveVolatileJitFrameIterators_(nullptr), reportGranularity(JS_DEFAULT_JITREPORT_GRANULARITY), resolvingList(nullptr), generatingError(false), savedFrameChains_(), - cycleDetectorSet(MOZ_THIS_IN_INITIALIZER_LIST()), + cycleDetectorSet(this), data(nullptr), data2(nullptr), outstandingRequests(0), jitIsBroken(false) { MOZ_ASSERT(static_cast<ContextFriendFields*>(this) == ContextFriendFields::get(this)); }
--- a/js/xpconnect/src/XPCJSRuntime.cpp +++ b/js/xpconnect/src/XPCJSRuntime.cpp @@ -3151,17 +3151,17 @@ class XPCJSSourceHook: public js::Source static const JSWrapObjectCallbacks WrapObjectCallbacks = { xpc::WrapperFactory::Rewrap, xpc::WrapperFactory::PrepareForWrapping }; XPCJSRuntime::XPCJSRuntime(nsXPConnect* aXPConnect) : CycleCollectedJSRuntime(nullptr, JS::DefaultHeapMaxBytes, JS::DefaultNurseryBytes), - mJSContextStack(new XPCJSContextStack(MOZ_THIS_IN_INITIALIZER_LIST())), + mJSContextStack(new XPCJSContextStack(this)), mCallContext(nullptr), mAutoRoots(nullptr), mResolveName(JSID_VOID), mResolvingWrapper(nullptr), mWrappedJSMap(JSObject2WrappedJSMap::newMap(XPC_JS_MAP_LENGTH)), mWrappedJSClassMap(IID2WrappedJSClassMap::newMap(XPC_JS_CLASS_MAP_LENGTH)), mIID2NativeInterfaceMap(IID2NativeInterfaceMap::newMap(XPC_NATIVE_INTERFACE_MAP_LENGTH)), mClassInfo2NativeSetMap(ClassInfo2NativeSetMap::newMap(XPC_NATIVE_SET_MAP_LENGTH)), @@ -3172,20 +3172,20 @@ XPCJSRuntime::XPCJSRuntime(nsXPConnect* mDetachedWrappedNativeProtoMap(XPCWrappedNativeProtoMap::newMap(XPC_DETACHED_NATIVE_PROTO_MAP_LENGTH)), mGCIsRunning(false), mWrappedJSToReleaseArray(), mNativesToReleaseArray(), mDoingFinalization(false), mVariantRoots(nullptr), mWrappedJSRoots(nullptr), mObjectHolderRoots(nullptr), - mWatchdogManager(new WatchdogManager(MOZ_THIS_IN_INITIALIZER_LIST())), - mUnprivilegedJunkScope(MOZ_THIS_IN_INITIALIZER_LIST()->Runtime(), nullptr), - mPrivilegedJunkScope(MOZ_THIS_IN_INITIALIZER_LIST()->Runtime(), nullptr), - mCompilationScope(MOZ_THIS_IN_INITIALIZER_LIST()->Runtime(), nullptr), + mWatchdogManager(new WatchdogManager(this)), + mUnprivilegedJunkScope(this->Runtime(), nullptr), + mPrivilegedJunkScope(this->Runtime(), nullptr), + mCompilationScope(this->Runtime(), nullptr), mAsyncSnowWhiteFreer(new AsyncFreeSnowWhite()) { // these jsids filled in later when we have a JSContext to work with. mStrIDs[0] = JSID_VOID; MOZ_ASSERT(Runtime()); JSRuntime* runtime = Runtime();
--- a/js/xpconnect/src/XPCWrappedJS.cpp +++ b/js/xpconnect/src/XPCWrappedJS.cpp @@ -380,17 +380,17 @@ nsXPCWrappedJS::GetNewOrUsed(JS::HandleO nsXPCWrappedJS::nsXPCWrappedJS(JSContext* cx, JSObject* aJSObj, nsXPCWrappedJSClass* aClass, nsXPCWrappedJS* root, nsresult *rv) : mJSObj(aJSObj), mClass(aClass), - mRoot(root ? root : MOZ_THIS_IN_INITIALIZER_LIST()), + mRoot(root ? root : this), mNext(nullptr) { *rv = InitStub(GetClass()->GetIID()); // Continue even in the failure case, so that our refcounting/Destroy // behavior works correctly. // There is an extra AddRef to support weak references to wrappers // that are subject to finalization. See the top of the file for more
--- a/layout/svg/nsSVGEffects.cpp +++ b/layout/svg/nsSVGEffects.cpp @@ -176,17 +176,17 @@ nsSVGRenderingObserver::ContentRemoved(n * * XXX: it would be nice to have a clear and concise executive summary of the * benefits/necessity of maintaining a second observer list. */ nsSVGIDRenderingObserver::nsSVGIDRenderingObserver(nsIURI* aURI, nsIContent* aObservingContent, bool aReferenceImage) - : mElement(MOZ_THIS_IN_INITIALIZER_LIST()) + : mElement(this) { // Start watching the target element mElement.Reset(aObservingContent, aURI, true, aReferenceImage); StartListening(); } nsSVGIDRenderingObserver::~nsSVGIDRenderingObserver() {
--- a/media/webrtc/signaling/src/mediapipeline/MediaPipeline.h +++ b/media/webrtc/signaling/src/mediapipeline/MediaPipeline.h @@ -614,17 +614,17 @@ class MediaPipelineReceiveVideo : public int level, RefPtr<VideoSessionConduit> conduit, RefPtr<TransportFlow> rtp_transport, RefPtr<TransportFlow> rtcp_transport, nsAutoPtr<MediaPipelineFilter> filter) : MediaPipelineReceive(pc, main_thread, sts_thread, stream, track_id, level, conduit, rtp_transport, rtcp_transport, filter), - renderer_(new PipelineRenderer(MOZ_THIS_IN_INITIALIZER_LIST())), + renderer_(new PipelineRenderer(this)), listener_(new PipelineListener(stream->AsSourceStream(), track_id)) { } // Called on the main thread. virtual void DetachMediaStream() MOZ_OVERRIDE { ASSERT_ON_THREAD(main_thread_); listener_->EndTrack();
--- a/mfbt/Attributes.h +++ b/mfbt/Attributes.h @@ -525,25 +525,11 @@ # define MOZ_NO_ARITHMETIC_EXPR_IN_ARGUMENT /* nothing */ # define MOZ_HEAP_ALLOCATOR /* nothing */ # define MOZ_OWNING_REF /* nothing */ # define MOZ_NON_OWNING_REF /* nothing */ # define MOZ_UNSAFE_REF(reason) /* nothing */ # define MOZ_NO_ADDREF_RELEASE_ON_RETURN /* nothing */ #endif /* MOZ_CLANG_PLUGIN */ -/* - * MOZ_THIS_IN_INITIALIZER_LIST is used to avoid a warning when we know that - * it's safe to use 'this' in an initializer list. - */ -#ifdef _MSC_VER -# define MOZ_THIS_IN_INITIALIZER_LIST() \ - __pragma(warning(push)) \ - __pragma(warning(disable:4355)) \ - this \ - __pragma(warning(pop)) -#else -# define MOZ_THIS_IN_INITIALIZER_LIST() this -#endif - #endif /* __cplusplus */ #endif /* mozilla_Attributes_h */
--- a/mfbt/LinkedList.h +++ b/mfbt/LinkedList.h @@ -112,18 +112,18 @@ class LinkedListElement private: LinkedListElement* mNext; LinkedListElement* mPrev; const bool mIsSentinel; public: LinkedListElement() - : mNext(MOZ_THIS_IN_INITIALIZER_LIST()), - mPrev(MOZ_THIS_IN_INITIALIZER_LIST()), + : mNext(this), + mPrev(this), mIsSentinel(false) { } LinkedListElement(LinkedListElement<T>&& other) : mIsSentinel(other.mIsSentinel) { if (!other.isInList()) { mNext = this; @@ -231,18 +231,18 @@ private: friend class LinkedList<T>; enum NodeKind { NODE_KIND_NORMAL, NODE_KIND_SENTINEL }; explicit LinkedListElement(NodeKind nodeKind) - : mNext(MOZ_THIS_IN_INITIALIZER_LIST()), - mPrev(MOZ_THIS_IN_INITIALIZER_LIST()), + : mNext(this), + mPrev(this), mIsSentinel(nodeKind == NODE_KIND_SENTINEL) { } /* * Return |this| cast to T* if we're a normal node, or return nullptr if * we're a sentinel node. */ T* asT()
--- a/netwerk/base/src/nsSocketTransport2.cpp +++ b/netwerk/base/src/nsSocketTransport2.cpp @@ -734,22 +734,22 @@ nsSocketTransport::nsSocketTransport() , mConnectionFlags(0) , mState(STATE_CLOSED) , mAttached(false) , mInputClosed(true) , mOutputClosed(true) , mResolving(false) , mNetAddrIsSet(false) , mLock("nsSocketTransport.mLock") - , mFD(MOZ_THIS_IN_INITIALIZER_LIST()) + , mFD(this) , mFDref(0) , mFDconnected(false) , mSocketTransportService(gSocketTransportService) - , mInput(MOZ_THIS_IN_INITIALIZER_LIST()) - , mOutput(MOZ_THIS_IN_INITIALIZER_LIST()) + , mInput(this) + , mOutput(this) , mQoSBits(0x00) , mKeepaliveEnabled(false) , mKeepaliveIdleTimeS(-1) , mKeepaliveRetryIntervalS(-1) , mKeepaliveProbeCount(-1) { SOCKET_LOG(("creating nsSocketTransport @%p\n", this));
--- a/netwerk/protocol/http/HttpChannelChild.cpp +++ b/netwerk/protocol/http/HttpChannelChild.cpp @@ -56,17 +56,17 @@ static_assert(FileDescriptorSet::MAX_DES } //----------------------------------------------------------------------------- // HttpChannelChild //----------------------------------------------------------------------------- HttpChannelChild::HttpChannelChild() - : HttpAsyncAborter<HttpChannelChild>(MOZ_THIS_IN_INITIALIZER_LIST()) + : HttpAsyncAborter<HttpChannelChild>(this) , mIsFromCache(false) , mCacheEntryAvailable(false) , mCacheExpirationTime(nsICacheEntry::NO_EXPIRATION_TIME) , mSendResumeAt(false) , mIPCOpen(false) , mKeptAlive(false) , mDivertingToParent(false) , mFlushedForDiversion(false)
--- a/netwerk/protocol/http/nsHttpAuthCache.cpp +++ b/netwerk/protocol/http/nsHttpAuthCache.cpp @@ -52,17 +52,17 @@ StrEquivalent(const char16_t *a, const c } //----------------------------------------------------------------------------- // nsHttpAuthCache <public> //----------------------------------------------------------------------------- nsHttpAuthCache::nsHttpAuthCache() : mDB(nullptr) - , mObserver(new AppDataClearObserver(MOZ_THIS_IN_INITIALIZER_LIST())) + , mObserver(new AppDataClearObserver(this)) { nsCOMPtr<nsIObserverService> obsSvc = services::GetObserverService(); if (obsSvc) { obsSvc->AddObserver(mObserver, "webapps-clear-data", false); } } nsHttpAuthCache::~nsHttpAuthCache()
--- a/netwerk/protocol/http/nsHttpChannel.cpp +++ b/netwerk/protocol/http/nsHttpChannel.cpp @@ -210,17 +210,17 @@ AutoRedirectVetoNotifier::ReportRedirect MOZ_EVENT_TRACER_DONE(channel, "net::http::redirect-callbacks"); } //----------------------------------------------------------------------------- // nsHttpChannel <public> //----------------------------------------------------------------------------- nsHttpChannel::nsHttpChannel() - : HttpAsyncAborter<nsHttpChannel>(MOZ_THIS_IN_INITIALIZER_LIST()) + : HttpAsyncAborter<nsHttpChannel>(this) , mLogicalOffset(0) , mPostID(0) , mRequestTime(0) , mOfflineCacheLastModifiedTime(0) , mInterceptCache(DO_NOT_INTERCEPT) , mCachedContentIsValid(false) , mCachedContentIsPartial(false) , mCacheOnlyMetadata(false)
--- a/security/certverifier/moz.build +++ b/security/certverifier/moz.build @@ -30,16 +30,17 @@ LOCAL_INCLUDES += [ DIRS += [ '../pkix', ] CXXFLAGS += ['-Wall'] if CONFIG['_MSC_VER']: # -Wall with Visual C++ enables too many problematic warnings CXXFLAGS += [ + '-wd4355', # 'this' used in base member initializer list '-wd4480', # nonstandard extension used: specifying underlying type for # enum 'enum' '-wd4481', # nonstandard extension used: override specifier 'keyword' '-wd4510', # default constructor could not be generated '-wd4512', # assignment operator could not be generated '-wd4514', # 'function': unreferenced inline function has been removed '-wd4610', # struct 'symbol' can never be instantiated - user defined # constructor required
--- a/tools/profiler/ProfileEntry.cpp +++ b/tools/profiler/ProfileEntry.cpp @@ -152,17 +152,17 @@ ThreadProfile::ThreadProfile(ThreadInfo* , mPseudoStack(aInfo->Stack()) , mMutex("ThreadProfile::mMutex") , mThreadId(aInfo->ThreadId()) , mIsMainThread(aInfo->IsMainThread()) , mPlatformData(aInfo->GetPlatformData()) , mGeneration(0) , mPendingGenerationFlush(0) , mStackTop(aInfo->StackTop()) - , mRespInfo(MOZ_THIS_IN_INITIALIZER_LIST()) + , mRespInfo(this) #ifdef XP_LINUX , mRssMemory(0) , mUssMemory(0) #endif { MOZ_COUNT_CTOR(ThreadProfile); mEntries = new ProfileEntry[mEntrySize]; }
--- a/xpcom/io/nsPipe3.cpp +++ b/xpcom/io/nsPipe3.cpp @@ -314,18 +314,18 @@ protected: // making changes to this file, please keep this fact in mind. // //----------------------------------------------------------------------------- // nsPipe methods: //----------------------------------------------------------------------------- nsPipe::nsPipe() - : mInput(MOZ_THIS_IN_INITIALIZER_LIST()) - , mOutput(MOZ_THIS_IN_INITIALIZER_LIST()) + : mInput(this) + , mOutput(this) , mReentrantMonitor("nsPipe.mReentrantMonitor") , mReadCursor(nullptr) , mReadLimit(nullptr) , mWriteSegment(-1) , mWriteCursor(nullptr) , mWriteLimit(nullptr) , mStatus(NS_OK) , mInited(false)