From 11b4e0b09cf5569c8e52c975d2d48b763995c705 Mon Sep 17 00:00:00 2001 From: Tom Schuster Date: Thu, 9 Jan 2014 18:39:37 +0100 Subject: [PATCH] Bug 939294 - Handlify content/. r=smaug --- content/base/public/nsDOMFile.h | 2 +- content/base/src/FileIOObject.h | 12 +++---- content/base/src/nsContentUtils.cpp | 2 +- content/base/src/nsDOMFile.cpp | 15 ++++---- content/base/src/nsDOMFileReader.cpp | 9 +++-- content/base/src/nsFrameMessageManager.cpp | 35 +++++++++---------- content/base/src/nsFrameMessageManager.h | 6 ++-- content/base/src/nsINode.cpp | 7 ++-- content/base/src/nsInProcessTabChildGlobal.h | 12 +++---- content/base/src/nsXMLHttpRequest.cpp | 6 ++-- content/events/src/nsDOMEventTargetHelper.h | 12 ++++--- content/events/src/nsDOMMessageEvent.cpp | 6 ++-- .../src/nsDOMNotifyAudioAvailableEvent.cpp | 6 ++-- .../src/nsDOMNotifyAudioAvailableEvent.h | 2 +- content/events/src/nsEventListenerService.cpp | 4 +-- .../html/content/public/HTMLCanvasElement.h | 6 ++-- .../html/content/src/HTMLCanvasElement.cpp | 2 +- content/html/content/src/HTMLMediaElement.cpp | 4 +-- content/media/WebVTTListener.cpp | 4 +-- .../synth/ipc/SpeechSynthesisChild.cpp | 2 +- .../synth/ipc/SpeechSynthesisChild.h | 2 +- .../media/webspeech/synth/nsSpeechTask.cpp | 2 +- 22 files changed, 80 insertions(+), 78 deletions(-) diff --git a/content/base/public/nsDOMFile.h b/content/base/public/nsDOMFile.h index 95194fa05ae3..48082378f04a 100644 --- a/content/base/public/nsDOMFile.h +++ b/content/base/public/nsDOMFile.h @@ -296,7 +296,7 @@ public: // Overrides NS_IMETHOD GetSize(uint64_t* aSize) MOZ_OVERRIDE; NS_IMETHOD GetType(nsAString& aType) MOZ_OVERRIDE; - NS_IMETHOD GetLastModifiedDate(JSContext* cx, JS::Value* aLastModifiedDate) MOZ_OVERRIDE; + NS_IMETHOD GetLastModifiedDate(JSContext* cx, JS::MutableHandle aLastModifiedDate) MOZ_OVERRIDE; NS_IMETHOD GetMozLastModifiedDate(uint64_t* aLastModifiedDate) MOZ_OVERRIDE; NS_IMETHOD GetMozFullPathInternal(nsAString& aFullPath) MOZ_OVERRIDE; NS_IMETHOD GetInternalStream(nsIInputStream**) MOZ_OVERRIDE; diff --git a/content/base/src/FileIOObject.h b/content/base/src/FileIOObject.h index 0f62cb13e9bb..5f3d5e23405d 100644 --- a/content/base/src/FileIOObject.h +++ b/content/base/src/FileIOObject.h @@ -48,12 +48,12 @@ public: return mError; } - NS_METHOD GetOnabort(JSContext* aCx, JS::Value* aValue); - NS_METHOD SetOnabort(JSContext* aCx, const JS::Value& aValue); - NS_METHOD GetOnerror(JSContext* aCx, JS::Value* aValue); - NS_METHOD SetOnerror(JSContext* aCx, const JS::Value& aValue); - NS_METHOD GetOnprogress(JSContext* aCx, JS::Value* aValue); - NS_METHOD SetOnprogress(JSContext* aCx, const JS::Value& aValue); + NS_METHOD GetOnabort(JSContext* aCx, JS::MutableHandle aValue); + NS_METHOD SetOnabort(JSContext* aCx, JS::Handle aValue); + NS_METHOD GetOnerror(JSContext* aCx, JS::MutableHandle aValue); + NS_METHOD SetOnerror(JSContext* aCx, JS::Handle aValue); + NS_METHOD GetOnprogress(JSContext* aCx, JS::MutableHandle aValue); + NS_METHOD SetOnprogress(JSContext* aCx, JS::Handle aValue); IMPL_EVENT_HANDLER(abort) IMPL_EVENT_HANDLER(error) diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp index 2b9877f7dfbe..510cd6dfada1 100644 --- a/content/base/src/nsContentUtils.cpp +++ b/content/base/src/nsContentUtils.cpp @@ -5635,7 +5635,7 @@ nsContentUtils::WrapNative(JSContext *cx, JS::Handle scope, nsresult rv = NS_OK; AutoPushJSContext context(cx); rv = sXPConnect->WrapNativeToJSVal(context, scope, native, cache, aIID, - aAllowWrapping, vp.address()); + aAllowWrapping, vp); return rv; } diff --git a/content/base/src/nsDOMFile.cpp b/content/base/src/nsDOMFile.cpp index d4549af487af..eb6e568a52b6 100644 --- a/content/base/src/nsDOMFile.cpp +++ b/content/base/src/nsDOMFile.cpp @@ -136,10 +136,13 @@ nsDOMFileBase::GetPath(nsAString &aPath) } NS_IMETHODIMP -nsDOMFileBase::GetLastModifiedDate(JSContext* cx, JS::Value *aLastModifiedDate) +nsDOMFileBase::GetLastModifiedDate(JSContext* cx, JS::MutableHandle aLastModifiedDate) { - JSObject* date = JS_NewDateObjectMsec(cx, JS_Now() / PR_USEC_PER_MSEC); - aLastModifiedDate->setObject(*date); + JS::Rooted date(cx, JS_NewDateObjectMsec(cx, JS_Now() / PR_USEC_PER_MSEC)); + if (!date) { + return NS_ERROR_OUT_OF_MEMORY; + } + aLastModifiedDate.setObject(*date); return NS_OK; } @@ -502,7 +505,7 @@ nsDOMFileFile::GetMozFullPathInternal(nsAString &aFilename) } NS_IMETHODIMP -nsDOMFileFile::GetLastModifiedDate(JSContext* cx, JS::Value* aLastModifiedDate) +nsDOMFileFile::GetLastModifiedDate(JSContext* cx, JS::MutableHandle aLastModifiedDate) { NS_ASSERTION(mIsFile, "Should only be called on files"); @@ -517,11 +520,11 @@ nsDOMFileFile::GetLastModifiedDate(JSContext* cx, JS::Value* aLastModifiedDate) JSObject* date = JS_NewDateObjectMsec(cx, msecs); if (date) { - aLastModifiedDate->setObject(*date); + aLastModifiedDate.setObject(*date); } else { date = JS_NewDateObjectMsec(cx, JS_Now() / PR_USEC_PER_MSEC); - aLastModifiedDate->setObject(*date); + aLastModifiedDate.setObject(*date); } return NS_OK; diff --git a/content/base/src/nsDOMFileReader.cpp b/content/base/src/nsDOMFileReader.cpp index 637ef74f4920..25e2602fa572 100644 --- a/content/base/src/nsDOMFileReader.cpp +++ b/content/base/src/nsDOMFileReader.cpp @@ -184,12 +184,12 @@ JS::Value nsDOMFileReader::GetResult(JSContext* aCx, ErrorResult& aRv) { JS::Rooted result(aCx); - aRv = GetResult(aCx, result.address()); + aRv = GetResult(aCx, &result); return result; } NS_IMETHODIMP -nsDOMFileReader::GetResult(JSContext* aCx, JS::Value* aResult) +nsDOMFileReader::GetResult(JSContext* aCx, JS::MutableHandle aResult) { JS::Rooted result(aCx); if (mDataFormat == FILE_AS_ARRAYBUFFER) { @@ -201,15 +201,14 @@ nsDOMFileReader::GetResult(JSContext* aCx, JS::Value* aResult) if (!JS_WrapValue(aCx, &result)) { return NS_ERROR_FAILURE; } - *aResult = result; + aResult.set(result); return NS_OK; } nsString tmpResult = mResult; - if (!xpc::StringToJsval(aCx, tmpResult, &result)) { + if (!xpc::StringToJsval(aCx, tmpResult, aResult)) { return NS_ERROR_FAILURE; } - *aResult = result; return NS_OK; } diff --git a/content/base/src/nsFrameMessageManager.cpp b/content/base/src/nsFrameMessageManager.cpp index 0220b8656b0f..a87241752159 100644 --- a/content/base/src/nsFrameMessageManager.cpp +++ b/content/base/src/nsFrameMessageManager.cpp @@ -447,7 +447,7 @@ nsFrameMessageManager::RemoveDelayedFrameScript(const nsAString& aURL) } NS_IMETHODIMP -nsFrameMessageManager::GetDelayedFrameScripts(JSContext* aCx, JS::Value* aList) +nsFrameMessageManager::GetDelayedFrameScripts(JSContext* aCx, JS::MutableHandle aList) { // Frame message managers may return an incomplete list because scripts // that were loaded after it was connected are not added to the list. @@ -478,8 +478,7 @@ nsFrameMessageManager::GetDelayedFrameScripts(JSContext* aCx, JS::Value* aList) NS_ERROR_OUT_OF_MEMORY); } - *aList = JS::ObjectValue(*array); - + aList.setObject(*array); return NS_OK; } @@ -527,12 +526,12 @@ static bool sSendingSyncMessage = false; NS_IMETHODIMP nsFrameMessageManager::SendSyncMessage(const nsAString& aMessageName, - const JS::Value& aJSON, - const JS::Value& aObjects, + JS::Handle aJSON, + JS::Handle aObjects, nsIPrincipal* aPrincipal, JSContext* aCx, uint8_t aArgc, - JS::Value* aRetval) + JS::MutableHandle aRetval) { return SendMessage(aMessageName, aJSON, aObjects, aPrincipal, aCx, aArgc, aRetval, true); @@ -540,12 +539,12 @@ nsFrameMessageManager::SendSyncMessage(const nsAString& aMessageName, NS_IMETHODIMP nsFrameMessageManager::SendRpcMessage(const nsAString& aMessageName, - const JS::Value& aJSON, - const JS::Value& aObjects, + JS::Handle aJSON, + JS::Handle aObjects, nsIPrincipal* aPrincipal, JSContext* aCx, uint8_t aArgc, - JS::Value* aRetval) + JS::MutableHandle aRetval) { return SendMessage(aMessageName, aJSON, aObjects, aPrincipal, aCx, aArgc, aRetval, false); @@ -553,19 +552,19 @@ nsFrameMessageManager::SendRpcMessage(const nsAString& aMessageName, nsresult nsFrameMessageManager::SendMessage(const nsAString& aMessageName, - const JS::Value& aJSON, - const JS::Value& aObjects, + JS::Handle aJSON, + JS::Handle aObjects, nsIPrincipal* aPrincipal, JSContext* aCx, uint8_t aArgc, - JS::Value* aRetval, + JS::MutableHandle aRetval, bool aIsSync) { NS_ASSERTION(!IsGlobal(), "Should not call SendSyncMessage in chrome"); NS_ASSERTION(!IsWindowLevel(), "Should not call SendSyncMessage in chrome"); NS_ASSERTION(!mParentManager, "Should not have parent manager in content!"); - *aRetval = JSVAL_VOID; + aRetval.setUndefined(); NS_ENSURE_TRUE(mCallback, NS_ERROR_NOT_INITIALIZED); if (sSendingSyncMessage && aIsSync) { @@ -618,7 +617,7 @@ nsFrameMessageManager::SendMessage(const nsAString& aMessageName, NS_ERROR_OUT_OF_MEMORY); } - *aRetval = OBJECT_TO_JSVAL(dataArray); + aRetval.setObject(*dataArray); return NS_OK; } @@ -678,8 +677,8 @@ nsFrameMessageManager::DispatchAsyncMessage(const nsAString& aMessageName, NS_IMETHODIMP nsFrameMessageManager::SendAsyncMessage(const nsAString& aMessageName, - const JS::Value& aJSON, - const JS::Value& aObjects, + JS::Handle aJSON, + JS::Handle aObjects, nsIPrincipal* aPrincipal, JSContext* aCx, uint8_t aArgc) @@ -693,8 +692,8 @@ nsFrameMessageManager::SendAsyncMessage(const nsAString& aMessageName, NS_IMETHODIMP nsFrameMessageManager::BroadcastAsyncMessage(const nsAString& aMessageName, - const JS::Value& aJSON, - const JS::Value& aObjects, + JS::Handle aJSON, + JS::Handle aObjects, JSContext* aCx, uint8_t aArgc) { diff --git a/content/base/src/nsFrameMessageManager.h b/content/base/src/nsFrameMessageManager.h index cd650b8ff3d1..c7f63cd92a13 100644 --- a/content/base/src/nsFrameMessageManager.h +++ b/content/base/src/nsFrameMessageManager.h @@ -271,12 +271,12 @@ public: } private: nsresult SendMessage(const nsAString& aMessageName, - const JS::Value& aJSON, - const JS::Value& aObjects, + JS::Handle aJSON, + JS::Handle aObjects, nsIPrincipal* aPrincipal, JSContext* aCx, uint8_t aArgc, - JS::Value* aRetval, + JS::MutableHandle aRetval, bool aIsSync); protected: friend class MMListenerRemover; diff --git a/content/base/src/nsINode.cpp b/content/base/src/nsINode.cpp index 7825d2e7aa07..d8acd51a8f2b 100644 --- a/content/base/src/nsINode.cpp +++ b/content/base/src/nsINode.cpp @@ -704,8 +704,7 @@ nsINode::SetUserData(JSContext* aCx, const nsAString& aKey, { nsCOMPtr data; JS::Rooted dataVal(aCx, aData); - aError = nsContentUtils::XPConnect()->JSValToVariant(aCx, dataVal.address(), - getter_AddRefs(data)); + aError = nsContentUtils::XPConnect()->JSValToVariant(aCx, dataVal, getter_AddRefs(data)); if (aError.Failed()) { return JS::UndefinedValue(); } @@ -723,7 +722,7 @@ nsINode::SetUserData(JSContext* aCx, const nsAString& aKey, JS::Rooted result(aCx); JSAutoCompartment ac(aCx, GetWrapper()); aError = nsContentUtils::XPConnect()->VariantToJS(aCx, GetWrapper(), oldData, - result.address()); + &result); return result; } @@ -750,7 +749,7 @@ nsINode::GetUserData(JSContext* aCx, const nsAString& aKey, ErrorResult& aError) JS::Rooted result(aCx); JSAutoCompartment ac(aCx, GetWrapper()); aError = nsContentUtils::XPConnect()->VariantToJS(aCx, GetWrapper(), data, - result.address()); + &result); return result; } diff --git a/content/base/src/nsInProcessTabChildGlobal.h b/content/base/src/nsInProcessTabChildGlobal.h index bbb3078e811b..102168af617f 100644 --- a/content/base/src/nsInProcessTabChildGlobal.h +++ b/content/base/src/nsInProcessTabChildGlobal.h @@ -41,12 +41,12 @@ public: NS_FORWARD_SAFE_NSIMESSAGELISTENERMANAGER(mMessageManager) NS_FORWARD_SAFE_NSIMESSAGESENDER(mMessageManager) NS_IMETHOD SendSyncMessage(const nsAString& aMessageName, - const JS::Value& aObject, - const JS::Value& aRemote, + JS::Handle aObject, + JS::Handle aRemote, nsIPrincipal* aPrincipal, JSContext* aCx, uint8_t aArgc, - JS::Value* aRetval) + JS::MutableHandle aRetval) { return mMessageManager ? mMessageManager->SendSyncMessage(aMessageName, aObject, aRemote, @@ -54,12 +54,12 @@ public: : NS_ERROR_NULL_POINTER; } NS_IMETHOD SendRpcMessage(const nsAString& aMessageName, - const JS::Value& aObject, - const JS::Value& aRemote, + JS::Handle aObject, + JS::Handle aRemote, nsIPrincipal* aPrincipal, JSContext* aCx, uint8_t aArgc, - JS::Value* aRetval) + JS::MutableHandle aRetval) { return mMessageManager ? mMessageManager->SendRpcMessage(aMessageName, aObject, aRemote, diff --git a/content/base/src/nsXMLHttpRequest.cpp b/content/base/src/nsXMLHttpRequest.cpp index 06e4133852dd..fdbd073f3903 100644 --- a/content/base/src/nsXMLHttpRequest.cpp +++ b/content/base/src/nsXMLHttpRequest.cpp @@ -921,10 +921,10 @@ nsXMLHttpRequest::SetResponseType(nsXMLHttpRequest::ResponseTypeEnum aResponseTy /* readonly attribute jsval response; */ NS_IMETHODIMP -nsXMLHttpRequest::GetResponse(JSContext *aCx, JS::Value *aResult) +nsXMLHttpRequest::GetResponse(JSContext *aCx, JS::MutableHandle aResult) { ErrorResult rv; - *aResult = GetResponse(aCx, rv); + aResult.set(GetResponse(aCx, rv)); return rv.ErrorCode(); } @@ -2403,7 +2403,7 @@ GetRequestBody(nsIVariant* aBody, nsIInputStream** aResult, uint64_t* aContentLe AutoSafeJSContext cx; JS::Rooted realVal(cx); - nsresult rv = aBody->GetAsJSVal(realVal.address()); + nsresult rv = aBody->GetAsJSVal(&realVal); if (NS_SUCCEEDED(rv) && !JSVAL_IS_PRIMITIVE(realVal)) { JS::Rooted obj(cx, JSVAL_TO_OBJECT(realVal)); if (JS_IsArrayBufferObject(obj)) { diff --git a/content/events/src/nsDOMEventTargetHelper.h b/content/events/src/nsDOMEventTargetHelper.h index 928dca503047..be350639bacd 100644 --- a/content/events/src/nsDOMEventTargetHelper.h +++ b/content/events/src/nsDOMEventTargetHelper.h @@ -172,24 +172,26 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsDOMEventTargetHelper, // XPIDL event handlers #define NS_IMPL_EVENT_HANDLER(_class, _event) \ - NS_IMETHODIMP _class::GetOn##_event(JSContext* aCx, JS::Value* aValue) \ + NS_IMETHODIMP _class::GetOn##_event(JSContext* aCx, \ + JS::MutableHandle aValue) \ { \ - GetEventHandler(nsGkAtoms::on##_event, aCx, aValue); \ + GetEventHandler(nsGkAtoms::on##_event, aCx, aValue.address()); \ return NS_OK; \ } \ NS_IMETHODIMP _class::SetOn##_event(JSContext* aCx, \ - const JS::Value& aValue) \ + JS::Handle aValue) \ { \ return SetEventHandler(nsGkAtoms::on##_event, aCx, aValue); \ } #define NS_IMPL_FORWARD_EVENT_HANDLER(_class, _event, _baseclass) \ - NS_IMETHODIMP _class::GetOn##_event(JSContext* aCx, JS::Value* aValue) \ + NS_IMETHODIMP _class::GetOn##_event(JSContext* aCx, \ + JS::MutableHandle aValue) \ { \ return _baseclass::GetOn##_event(aCx, aValue); \ } \ NS_IMETHODIMP _class::SetOn##_event(JSContext* aCx, \ - const JS::Value& aValue) \ + JS::Handle aValue) \ { \ return _baseclass::SetOn##_event(aCx, aValue); \ } diff --git a/content/events/src/nsDOMMessageEvent.cpp b/content/events/src/nsDOMMessageEvent.cpp index 818e6d37b036..cde017ea5359 100644 --- a/content/events/src/nsDOMMessageEvent.cpp +++ b/content/events/src/nsDOMMessageEvent.cpp @@ -63,10 +63,10 @@ nsDOMMessageEvent::WrapObject(JSContext* aCx, JS::Handle aScope) } NS_IMETHODIMP -nsDOMMessageEvent::GetData(JSContext* aCx, JS::Value* aData) +nsDOMMessageEvent::GetData(JSContext* aCx, JS::MutableHandle aData) { ErrorResult rv; - *aData = GetData(aCx, rv); + aData.set(GetData(aCx, rv)); return rv.ErrorCode(); } @@ -171,7 +171,7 @@ NS_IMETHODIMP nsDOMMessageEvent::InitMessageEvent(const nsAString& aType, bool aCanBubble, bool aCancelable, - const JS::Value& aData, + JS::Handle aData, const nsAString& aOrigin, const nsAString& aLastEventId, nsIDOMWindow* aSource) diff --git a/content/events/src/nsDOMNotifyAudioAvailableEvent.cpp b/content/events/src/nsDOMNotifyAudioAvailableEvent.cpp index 26c31eca1377..cec5f37169c3 100644 --- a/content/events/src/nsDOMNotifyAudioAvailableEvent.cpp +++ b/content/events/src/nsDOMNotifyAudioAvailableEvent.cpp @@ -66,7 +66,7 @@ nsDOMNotifyAudioAvailableEvent::~nsDOMNotifyAudioAvailableEvent() } NS_IMETHODIMP -nsDOMNotifyAudioAvailableEvent::GetFrameBuffer(JSContext* aCx, JS::Value* aResult) +nsDOMNotifyAudioAvailableEvent::GetFrameBuffer(JSContext* aCx, JS::MutableHandle aResult) { if (!mAllowAudioData) { // Media is not same-origin, don't allow the data out. @@ -74,7 +74,7 @@ nsDOMNotifyAudioAvailableEvent::GetFrameBuffer(JSContext* aCx, JS::Value* aResul } if (mCachedArray) { - *aResult = OBJECT_TO_JSVAL(mCachedArray); + aResult.setObject(*mCachedArray); return NS_OK; } @@ -88,7 +88,7 @@ nsDOMNotifyAudioAvailableEvent::GetFrameBuffer(JSContext* aCx, JS::Value* aResul } memcpy(JS_GetFloat32ArrayData(mCachedArray), mFrameBuffer.get(), mFrameBufferLength * sizeof(float)); - *aResult = OBJECT_TO_JSVAL(mCachedArray); + aResult.setObject(*mCachedArray); return NS_OK; } diff --git a/content/events/src/nsDOMNotifyAudioAvailableEvent.h b/content/events/src/nsDOMNotifyAudioAvailableEvent.h index ce4aee3802a9..12a11cdc9a8f 100644 --- a/content/events/src/nsDOMNotifyAudioAvailableEvent.h +++ b/content/events/src/nsDOMNotifyAudioAvailableEvent.h @@ -51,7 +51,7 @@ public: JSObject* GetFrameBuffer(JSContext* aCx, mozilla::ErrorResult& aRv) { JS::Rooted dummy(aCx); - aRv = GetFrameBuffer(aCx, dummy.address()); + aRv = GetFrameBuffer(aCx, &dummy); return mCachedArray; } diff --git a/content/events/src/nsEventListenerService.cpp b/content/events/src/nsEventListenerService.cpp index 12657b6786ee..8e59336ab9ce 100644 --- a/content/events/src/nsEventListenerService.cpp +++ b/content/events/src/nsEventListenerService.cpp @@ -65,10 +65,10 @@ nsEventListenerInfo::GetInSystemEventGroup(bool* aInSystemEventGroup) } NS_IMETHODIMP -nsEventListenerInfo::GetListenerObject(JSContext* aCx, JS::Value* aObject) +nsEventListenerInfo::GetListenerObject(JSContext* aCx, JS::MutableHandle aObject) { mozilla::Maybe ac; - GetJSVal(aCx, ac, aObject); + GetJSVal(aCx, ac, aObject.address()); return NS_OK; } diff --git a/content/html/content/public/HTMLCanvasElement.h b/content/html/content/public/HTMLCanvasElement.h index d5e32f51d5cf..30b105ac952e 100644 --- a/content/html/content/public/HTMLCanvasElement.h +++ b/content/html/content/public/HTMLCanvasElement.h @@ -86,9 +86,9 @@ public: const Optional >& aParams, nsAString& aDataURL, ErrorResult& aRv) { - JS::Value params = aParams.WasPassed() - ? aParams.Value() - : JS::UndefinedValue(); + JS::Rooted params(aCx, aParams.WasPassed() + ? aParams.Value() + : JS::UndefinedValue()); aRv = ToDataURL(aType, params, aCx, aDataURL); } void ToBlob(JSContext* aCx, diff --git a/content/html/content/src/HTMLCanvasElement.cpp b/content/html/content/src/HTMLCanvasElement.cpp index 77022ca477cb..7c33c96a9b28 100644 --- a/content/html/content/src/HTMLCanvasElement.cpp +++ b/content/html/content/src/HTMLCanvasElement.cpp @@ -327,7 +327,7 @@ HTMLCanvasElement::ParseAttribute(int32_t aNamespaceID, // HTMLCanvasElement::toDataURL NS_IMETHODIMP -HTMLCanvasElement::ToDataURL(const nsAString& aType, const JS::Value& aParams, +HTMLCanvasElement::ToDataURL(const nsAString& aType, JS::Handle aParams, JSContext* aCx, nsAString& aDataURL) { // do a trust check if this is a write-only canvas diff --git a/content/html/content/src/HTMLMediaElement.cpp b/content/html/content/src/HTMLMediaElement.cpp index ff1dcff3aa2a..010367b1033e 100644 --- a/content/html/content/src/HTMLMediaElement.cpp +++ b/content/html/content/src/HTMLMediaElement.cpp @@ -1642,14 +1642,14 @@ HTMLMediaElement::MozGetMetadata(JSContext* cx, ErrorResult& aRv) } NS_IMETHODIMP -HTMLMediaElement::MozGetMetadata(JSContext* cx, JS::Value* aValue) +HTMLMediaElement::MozGetMetadata(JSContext* cx, JS::MutableHandle aValue) { ErrorResult rv; JSObject* obj = MozGetMetadata(cx, rv); if (!rv.Failed()) { MOZ_ASSERT(obj); - *aValue = JS::ObjectValue(*obj); + aValue.setObject(*obj); } return rv.ErrorCode(); diff --git a/content/media/WebVTTListener.cpp b/content/media/WebVTTListener.cpp index c5a0f5b48171..fb6a1ad777fd 100644 --- a/content/media/WebVTTListener.cpp +++ b/content/media/WebVTTListener.cpp @@ -155,7 +155,7 @@ WebVTTListener::OnDataAvailable(nsIRequest* aRequest, } NS_IMETHODIMP -WebVTTListener::OnCue(const JS::Value &aCue, JSContext* aCx) +WebVTTListener::OnCue(JS::Handle aCue, JSContext* aCx) { if (!aCue.isObject()) { return NS_ERROR_FAILURE; @@ -173,7 +173,7 @@ WebVTTListener::OnCue(const JS::Value &aCue, JSContext* aCx) NS_IMETHODIMP -WebVTTListener::OnRegion(const JS::Value &aRegion, JSContext* aCx) +WebVTTListener::OnRegion(JS::Handle aRegion, JSContext* aCx) { if (!aRegion.isObject()) { return NS_ERROR_FAILURE; diff --git a/content/media/webspeech/synth/ipc/SpeechSynthesisChild.cpp b/content/media/webspeech/synth/ipc/SpeechSynthesisChild.cpp index 69c638560618..57eb27d7ac89 100644 --- a/content/media/webspeech/synth/ipc/SpeechSynthesisChild.cpp +++ b/content/media/webspeech/synth/ipc/SpeechSynthesisChild.cpp @@ -152,7 +152,7 @@ SpeechTaskChild::Setup(nsISpeechTaskCallback* aCallback, } NS_IMETHODIMP -SpeechTaskChild::SendAudio(const JS::Value& aData, const JS::Value& aLandmarks, +SpeechTaskChild::SendAudio(JS::Handle aData, JS::Handle aLandmarks, JSContext* aCx) { MOZ_CRASH("Should never be called from child"); diff --git a/content/media/webspeech/synth/ipc/SpeechSynthesisChild.h b/content/media/webspeech/synth/ipc/SpeechSynthesisChild.h index 48c3f6dd2a8b..bd615ceb98c5 100644 --- a/content/media/webspeech/synth/ipc/SpeechSynthesisChild.h +++ b/content/media/webspeech/synth/ipc/SpeechSynthesisChild.h @@ -79,7 +79,7 @@ public: NS_IMETHOD Setup(nsISpeechTaskCallback* aCallback, uint32_t aChannels, uint32_t aRate, uint8_t argc) MOZ_OVERRIDE; - NS_IMETHOD SendAudio(const JS::Value& aData, const JS::Value& aLandmarks, + NS_IMETHOD SendAudio(JS::Handle aData, JS::Handle aLandmarks, JSContext* aCx) MOZ_OVERRIDE; NS_IMETHOD SendAudioNative(int16_t* aData, uint32_t aDataLen) MOZ_OVERRIDE; diff --git a/content/media/webspeech/synth/nsSpeechTask.cpp b/content/media/webspeech/synth/nsSpeechTask.cpp index e61dc0dca635..9f4ff7ba51e7 100644 --- a/content/media/webspeech/synth/nsSpeechTask.cpp +++ b/content/media/webspeech/synth/nsSpeechTask.cpp @@ -156,7 +156,7 @@ nsSpeechTask::Setup(nsISpeechTaskCallback* aCallback, } NS_IMETHODIMP -nsSpeechTask::SendAudio(const JS::Value& aData, const JS::Value& aLandmarks, +nsSpeechTask::SendAudio(JS::Handle aData, JS::Handle aLandmarks, JSContext* aCx) { MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);