Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-07 18:04:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1639310 - Remove unnecessary implicitJSContext annotations. r=mccr8

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D76020
This commit is contained in:
Peter Van der Beken 2020-05-19 20:48:21 +00:00
parent e96baf70af
commit af82496fc7
21 changed files with 54 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dom/base/nsGlobalWindowInner.cpp
View File

@ -7101,13 +7101,13 @@ void nsGlobalWindowInner::FireOnNewGlobalObject() {
#endif
already_AddRefed<Promise> nsGlobalWindowInner::CreateImageBitmap(
JSContext* aCx, const ImageBitmapSource& aImage, ErrorResult& aRv) {
const ImageBitmapSource& aImage, ErrorResult& aRv) {
return ImageBitmap::Create(this, aImage, Nothing(), aRv);
}
already_AddRefed<Promise> nsGlobalWindowInner::CreateImageBitmap(
JSContext* aCx, const ImageBitmapSource& aImage, int32_t aSx, int32_t aSy,
int32_t aSw, int32_t aSh, ErrorResult& aRv) {
const ImageBitmapSource& aImage, int32_t aSx, int32_t aSy, int32_t aSw,
int32_t aSh, ErrorResult& aRv) {
return ImageBitmap::Create(this, aImage,
Some(gfx::IntRect(aSx, aSy, aSw, aSh)), aRv);
}

8
dom/base/nsGlobalWindowInner.h
View File

@ -873,13 +873,11 @@ class nsGlobalWindowInner final : public mozilla::dom::EventTarget,
mozilla::ErrorResult& aError);
already_AddRefed<mozilla::dom::Promise> CreateImageBitmap(
JSContext* aCx, const mozilla::dom::ImageBitmapSource& aImage,
mozilla::ErrorResult& aRv);
const mozilla::dom::ImageBitmapSource& aImage, mozilla::ErrorResult& aRv);
already_AddRefed<mozilla::dom::Promise> CreateImageBitmap(
JSContext* aCx, const mozilla::dom::ImageBitmapSource& aImage,
int32_t aSx, int32_t aSy, int32_t aSw, int32_t aSh,
mozilla::ErrorResult& aRv);
const mozilla::dom::ImageBitmapSource& aImage, int32_t aSx, int32_t aSy,
int32_t aSw, int32_t aSh, mozilla::ErrorResult& aRv);
// ChromeWindow bits. Do NOT call these unless your window is in
// fact chrome.

30
dom/bindings/Bindings.conf
View File

@ -119,10 +119,6 @@ DOMInterfaces = {
'concrete': True,
},
'Clipboard' : {
'implicitJSContext' : ['write', 'writeText', 'read', 'readText'],
},
'ClonedErrorHolder': {
'wrapperCache': False
},
@ -213,10 +209,6 @@ DOMInterfaces = {
'implicitJSContext': [ 'filename', 'lineNumber', 'stack' ],
},
'DOMLocalization': {
'implicitJSContext': [ 'getAttributes' ],
},
'DOMMatrixReadOnly': {
'headerFile': 'mozilla/dom/DOMMatrix.h',
},
@ -234,7 +226,6 @@ DOMInterfaces = {
},
'DOMRequest': {
'implicitJSContext': [ 'then' ],
'concrete': True,
},
@ -480,10 +471,6 @@ DOMInterfaces = {
'wrapperCache': False,
},
'MediaKeys' : {
'implicitJSContext': [ 'createSession']
},
'MediaStream': {
'headerFile': 'DOMMediaStream.h',
'nativeType': 'mozilla::DOMMediaStream'
@ -1011,10 +998,6 @@ DOMInterfaces = {
'wrapperCache': False
},
'TCPSocket': {
'implicitJSContext': ['send']
},
'TouchList': {
'headerFile': 'mozilla/dom/TouchEvent.h',
},
@ -1048,10 +1031,6 @@ DOMInterfaces = {
'nativeType': 'mozilla::dom::TextTrackRegion',
},
'WebAuthentication': {
'implicitJSContext': 'makeCredential',
},
'WebExtensionContentScript': {
'nativeType': 'mozilla::extensions::WebExtensionContentScript',
},
@ -1469,7 +1448,6 @@ DOMInterfaces = {
'nativeType': 'nsGlobalWindowInner',
'headerFile': 'nsGlobalWindow.h',
'implicitJSContext': [
'createImageBitmap',
'requestIdleCallback'
],
},
@ -1491,13 +1469,13 @@ DOMInterfaces = {
'WorkerDebuggerGlobalScope': {
'headerFile': 'mozilla/dom/WorkerScope.h',
'implicitJSContext': [
'dump', 'global', 'reportError', 'setConsoleEventHandler',
'dump', 'reportError', 'setConsoleEventHandler',
],
},
'WorkerGlobalScope': {
'headerFile': 'mozilla/dom/WorkerScope.h',
'implicitJSContext': [ 'createImageBitmap', 'importScripts' ],
'implicitJSContext': [ 'importScripts' ],
},
'Worklet': {
@ -1506,10 +1484,6 @@ DOMInterfaces = {
'implicitJSContext': [ 'addModule' ],
},
'XMLHttpRequest': {
'implicitJSContext': [ 'send'],
},
'XMLSerializer': {
'nativeType': 'nsDOMSerializer',
'wrapperCache': False

21
dom/events/Clipboard.cpp
View File

@ -29,8 +29,8 @@ Clipboard::Clipboard(nsPIDOMWindowInner* aWindow)
Clipboard::~Clipboard() = default;
already_AddRefed<Promise> Clipboard::ReadHelper(
JSContext* aCx, nsIPrincipal& aSubjectPrincipal,
ClipboardReadType aClipboardReadType, ErrorResult& aRv) {
nsIPrincipal& aSubjectPrincipal, ClipboardReadType aClipboardReadType,
ErrorResult& aRv) {
// Create a new promise
RefPtr<Promise> p = dom::Promise::Create(GetOwnerGlobal(), aRv);
if (aRv.Failed()) {
@ -86,19 +86,17 @@ already_AddRefed<Promise> Clipboard::ReadHelper(
return p.forget();
}
already_AddRefed<Promise> Clipboard::Read(JSContext* aCx,
nsIPrincipal& aSubjectPrincipal,
already_AddRefed<Promise> Clipboard::Read(nsIPrincipal& aSubjectPrincipal,
ErrorResult& aRv) {
return ReadHelper(aCx, aSubjectPrincipal, eRead, aRv);
return ReadHelper(aSubjectPrincipal, eRead, aRv);
}
already_AddRefed<Promise> Clipboard::ReadText(JSContext* aCx,
nsIPrincipal& aSubjectPrincipal,
already_AddRefed<Promise> Clipboard::ReadText(nsIPrincipal& aSubjectPrincipal,
ErrorResult& aRv) {
return ReadHelper(aCx, aSubjectPrincipal, eReadText, aRv);
return ReadHelper(aSubjectPrincipal, eReadText, aRv);
}
already_AddRefed<Promise> Clipboard::Write(JSContext* aCx, DataTransfer& aData,
already_AddRefed<Promise> Clipboard::Write(DataTransfer& aData,
nsIPrincipal& aSubjectPrincipal,
ErrorResult& aRv) {
// Create a promise
@ -160,8 +158,7 @@ already_AddRefed<Promise> Clipboard::Write(JSContext* aCx, DataTransfer& aData,
return p.forget();
}
already_AddRefed<Promise> Clipboard::WriteText(JSContext* aCx,
const nsAString& aData,
already_AddRefed<Promise> Clipboard::WriteText(const nsAString& aData,
nsIPrincipal& aSubjectPrincipal,
ErrorResult& aRv) {
// We create a data transfer with text/plain format so that
@ -171,7 +168,7 @@ already_AddRefed<Promise> Clipboard::WriteText(JSContext* aCx,
/* clipboard type */ -1);
dataTransfer->SetData(NS_LITERAL_STRING(kTextMime), aData, aSubjectPrincipal,
aRv);
return Write(aCx, *dataTransfer, aSubjectPrincipal, aRv);
return Write(*dataTransfer, aSubjectPrincipal, aRv);
}
JSObject* Clipboard::WrapObject(JSContext* aCx,

13
dom/events/Clipboard.h
View File

@ -32,16 +32,14 @@ class Clipboard : public DOMEventTargetHelper {
IMPL_EVENT_HANDLER(messageerror)
explicit Clipboard(nsPIDOMWindowInner* aWindow);
already_AddRefed<Promise> Read(JSContext* aCx,
nsIPrincipal& aSubjectPrincipal,
already_AddRefed<Promise> Read(nsIPrincipal& aSubjectPrincipal,
ErrorResult& aRv);
already_AddRefed<Promise> ReadText(JSContext* aCx,
nsIPrincipal& aSubjectPrincipal,
already_AddRefed<Promise> ReadText(nsIPrincipal& aSubjectPrincipal,
ErrorResult& aRv);
already_AddRefed<Promise> Write(JSContext* aCx, DataTransfer& aData,
already_AddRefed<Promise> Write(DataTransfer& aData,
nsIPrincipal& aSubjectPrincipal,
ErrorResult& aRv);
already_AddRefed<Promise> WriteText(JSContext* aCx, const nsAString& aData,
already_AddRefed<Promise> WriteText(const nsAString& aData,
nsIPrincipal& aSubjectPrincipal,
ErrorResult& aRv);
@ -64,8 +62,7 @@ class Clipboard : public DOMEventTargetHelper {
// or reading from the clipboard.
static bool IsTestingPrefEnabled();
already_AddRefed<Promise> ReadHelper(JSContext* aCx,
nsIPrincipal& aSubjectPrincipal,
already_AddRefed<Promise> ReadHelper(nsIPrincipal& aSubjectPrincipal,
ClipboardReadType aClipboardReadType,
ErrorResult& aRv);

11
dom/l10n/DOMLocalization.cpp
View File

@ -131,8 +131,8 @@ void DOMLocalization::SetAttributes(
}
}
void DOMLocalization::GetAttributes(JSContext* aCx, Element& aElement,
L10nKey& aResult, ErrorResult& aRv) {
void DOMLocalization::GetAttributes(Element& aElement, L10nKey& aResult,
ErrorResult& aRv) {
nsAutoString l10nId;
nsAutoString l10nArgs;
@ -141,7 +141,7 @@ void DOMLocalization::GetAttributes(JSContext* aCx, Element& aElement,
}
if (aElement.GetAttr(kNameSpaceID_None, nsGkAtoms::datal10nargs, l10nArgs)) {
ConvertStringToL10nArgs(aCx, l10nArgs, aResult.mArgs.SetValue(), aRv);
ConvertStringToL10nArgs(l10nArgs, aResult.mArgs.SetValue(), aRv);
}
}
@ -299,7 +299,7 @@ already_AddRefed<Promise> DOMLocalization::TranslateElements(
return nullptr;
}
GetAttributes(cx, *domElement, *key, aRv);
GetAttributes(*domElement, *key, aRv);
if (NS_WARN_IF(aRv.Failed())) {
return nullptr;
}
@ -568,8 +568,7 @@ void DOMLocalization::ReportL10nOverlaysErrors(
}
}
void DOMLocalization::ConvertStringToL10nArgs(JSContext* aCx,
const nsString& aInput,
void DOMLocalization::ConvertStringToL10nArgs(const nsString& aInput,
intl::L10nArgs& aRetVal,
ErrorResult& aRv) {
// This method uses a temporary dictionary to automate

7
dom/l10n/DOMLocalization.h
View File

@ -48,8 +48,7 @@ class DOMLocalization : public intl::Localization {
void SetAttributes(JSContext* aCx, Element& aElement, const nsAString& aId,
const Optional<JS::Handle<JSObject*>>& aArgs,
ErrorResult& aRv);
void GetAttributes(JSContext* aCx, Element& aElement, L10nKey& aResult,
ErrorResult& aRv);
void GetAttributes(Element& aElement, L10nKey& aResult, ErrorResult& aRv);
already_AddRefed<Promise> TranslateFragment(nsINode& aNode, ErrorResult& aRv);
@ -108,8 +107,8 @@ class DOMLocalization : public intl::Localization {
void DisconnectMutations();
void DisconnectRoots();
void ReportL10nOverlaysErrors(nsTArray<L10nOverlaysError>& aErrors);
void ConvertStringToL10nArgs(JSContext* aCx, const nsString& aInput,
intl::L10nArgs& aRetVal, ErrorResult& aRv);
void ConvertStringToL10nArgs(const nsString& aInput, intl::L10nArgs& aRetVal,
ErrorResult& aRv);
RefPtr<L10nMutations> mMutations;
nsTHashtable<nsRefPtrHashKey<nsINode>> mRoots;

4
dom/media/eme/MediaKeySession.cpp
View File

@ -50,8 +50,8 @@ static const uint32_t MAX_KEY_ID_LENGTH = 512;
// platform tests.
static const uint32_t MAX_CENC_INIT_DATA_LENGTH = 64 * 1024;
MediaKeySession::MediaKeySession(JSContext* aCx, nsPIDOMWindowInner* aParent,
MediaKeys* aKeys, const nsAString& aKeySystem,
MediaKeySession::MediaKeySession(nsPIDOMWindowInner* aParent, MediaKeys* aKeys,
const nsAString& aKeySystem,
MediaKeySessionType aSessionType,
ErrorResult& aRv)
: DOMEventTargetHelper(aParent),

2
dom/media/eme/MediaKeySession.h
View File

@ -47,7 +47,7 @@ class MediaKeySession final : public DOMEventTargetHelper,
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(MediaKeySession,
DOMEventTargetHelper)
public:
MediaKeySession(JSContext* aCx, nsPIDOMWindowInner* aParent, MediaKeys* aKeys,
MediaKeySession(nsPIDOMWindowInner* aParent, MediaKeys* aKeys,
const nsAString& aKeySystem, MediaKeySessionType aSessionType,
ErrorResult& aRv);

12
dom/media/eme/MediaKeys.cpp
View File

@ -513,9 +513,9 @@ static bool IsSessionTypeSupported(const MediaKeySessionType aSessionType,
}
already_AddRefed<MediaKeySession> MediaKeys::CreateSession(
JSContext* aCx, MediaKeySessionType aSessionType, ErrorResult& aRv) {
EME_LOG("MediaKeys[%p]::CreateSession(aCx=%p, aSessionType=%" PRIu8 ")", this,
aCx, static_cast<uint8_t>(aSessionType));
MediaKeySessionType aSessionType, ErrorResult& aRv) {
EME_LOG("MediaKeys[%p]::CreateSession(aSessionType=%" PRIu8 ")", this,
static_cast<uint8_t>(aSessionType));
if (!IsSessionTypeSupported(aSessionType, mConfig)) {
EME_LOG("MediaKeys[%p]::CreateSession() failed, unsupported session type",
this);
@ -532,7 +532,7 @@ already_AddRefed<MediaKeySession> MediaKeys::CreateSession(
EME_LOG("MediaKeys[%p] Creating session", this);
RefPtr<MediaKeySession> session = new MediaKeySession(
aCx, GetParentObject(), this, mKeySystem, aSessionType, aRv);
GetParentObject(), this, mKeySystem, aSessionType, aRv);
if (aRv.Failed()) {
return nullptr;
@ -540,9 +540,9 @@ already_AddRefed<MediaKeySession> MediaKeys::CreateSession(
DDLINKCHILD("session", session.get());
// Add session to the set of sessions awaiting their sessionId being ready.
EME_LOG("MediaKeys[%p]::CreateSession(aCx=%p, aSessionType=%" PRIu8
EME_LOG("MediaKeys[%p]::CreateSession(aSessionType=%" PRIu8
") putting session with token=%" PRIu32 " into mPendingSessions",
this, aCx, static_cast<uint8_t>(aSessionType), session->Token());
this, static_cast<uint8_t>(aSessionType), session->Token());
mPendingSessions.Put(session->Token(), RefPtr{session});
return session.forget();

2
dom/media/eme/MediaKeys.h
View File

@ -80,7 +80,7 @@ class MediaKeys final : public nsIDocumentActivity,
// JavaScript: MediaKeys.createSession()
already_AddRefed<MediaKeySession> CreateSession(
JSContext* aCx, MediaKeySessionType aSessionType, ErrorResult& aRv);
MediaKeySessionType aSessionType, ErrorResult& aRv);
// JavaScript: MediaKeys.SetServerCertificate()
already_AddRefed<DetailedPromise> SetServerCertificate(

9
dom/network/TCPSocket.cpp
View File

@ -9,6 +9,7 @@
#include "TCPSocket.h"
#include "TCPServerSocket.h"
#include "TCPSocketChild.h"
#include "mozilla/dom/ScriptSettings.h"
#include "mozilla/dom/TCPSocketBinding.h"
#include "mozilla/dom/TCPSocketErrorEvent.h"
#include "mozilla/dom/TCPSocketErrorEventBinding.h"
@ -721,8 +722,7 @@ void TCPSocket::CloseHelper(bool waitForUnsentData) {
}
}
bool TCPSocket::Send(JSContext* aCx, const nsACString& aData,
mozilla::ErrorResult& aRv) {
bool TCPSocket::Send(const nsACString& aData, mozilla::ErrorResult& aRv) {
if (mReadyState != TCPReadyState::Open) {
aRv.Throw(NS_ERROR_FAILURE);
return false;
@ -748,8 +748,7 @@ bool TCPSocket::Send(JSContext* aCx, const nsACString& aData,
return Send(stream, byteLength);
}
bool TCPSocket::Send(JSContext* aCx, const ArrayBuffer& aData,
uint32_t aByteOffset,
bool TCPSocket::Send(const ArrayBuffer& aData, uint32_t aByteOffset,
const Optional<uint32_t>& aByteLength,
mozilla::ErrorResult& aRv) {
if (mReadyState != TCPReadyState::Open) {
@ -770,7 +769,7 @@ bool TCPSocket::Send(JSContext* aCx, const ArrayBuffer& aData,
return false;
}
} else {
JS::Rooted<JS::Value> value(aCx, JS::ObjectValue(*aData.Obj()));
JS::Rooted<JS::Value> value(RootingCx(), JS::ObjectValue(*aData.Obj()));
stream = do_CreateInstance("@mozilla.org/io/arraybuffer-input-stream;1");
nsresult rv = stream->SetData(value, aByteOffset, byteLength);

4
dom/network/TCPSocket.h
View File

@ -96,8 +96,8 @@ class TCPSocket final : public DOMEventTargetHelper,
void Resume(ErrorResult& aRv);
void Close();
void CloseImmediately();
bool Send(JSContext* aCx, const nsACString& aData, ErrorResult& aRv);
bool Send(JSContext* aCx, const ArrayBuffer& aData, uint32_t aByteOffset,
bool Send(const nsACString& aData, ErrorResult& aRv);
bool Send(const ArrayBuffer& aData, uint32_t aByteOffset,
const Optional<uint32_t>& aByteLength, ErrorResult& aRv);
TCPReadyState ReadyState();
TCPSocketBinaryType BinaryType();

4
dom/network/TCPSocketParent.cpp
View File

@ -127,13 +127,13 @@ mozilla::ipc::IPCResult TCPSocketParent::RecvData(const SendableData& aData) {
return IPC_FAIL_NO_REASON(this);
}
Optional<uint32_t> byteLength(buffer.Length());
mSocket->Send(autoCx, data, 0, byteLength, rv);
mSocket->Send(data, 0, byteLength, rv);
break;
}
case SendableData::TnsCString: {
const nsCString& strData = aData.get_nsCString();
mSocket->Send(nullptr, strData, rv);
mSocket->Send(strData, rv);
break;
}

6
dom/workers/WorkerScope.cpp
View File

@ -561,13 +561,13 @@ already_AddRefed<IDBFactory> WorkerGlobalScope::GetIndexedDB(
}
already_AddRefed<Promise> WorkerGlobalScope::CreateImageBitmap(
JSContext* aCx, const ImageBitmapSource& aImage, ErrorResult& aRv) {
const ImageBitmapSource& aImage, ErrorResult& aRv) {
return ImageBitmap::Create(this, aImage, Nothing(), aRv);
}
already_AddRefed<Promise> WorkerGlobalScope::CreateImageBitmap(
JSContext* aCx, const ImageBitmapSource& aImage, int32_t aSx, int32_t aSy,
int32_t aSw, int32_t aSh, ErrorResult& aRv) {
const ImageBitmapSource& aImage, int32_t aSx, int32_t aSy, int32_t aSw,
int32_t aSh, ErrorResult& aRv) {
return ImageBitmap::Create(this, aImage,
Some(gfx::IntRect(aSx, aSy, aSw, aSh)), aRv);
}

6
dom/workers/WorkerScope.h
View File

@ -257,12 +257,10 @@ class WorkerGlobalScope : public WorkerGlobalScopeBase,
MOZ_CAN_RUN_SCRIPT
void ClearInterval(int32_t aHandle);
already_AddRefed<Promise> CreateImageBitmap(JSContext* aCx,
const ImageBitmapSource& aImage,
already_AddRefed<Promise> CreateImageBitmap(const ImageBitmapSource& aImage,
ErrorResult& aRv);
already_AddRefed<Promise> CreateImageBitmap(JSContext* aCx,
const ImageBitmapSource& aImage,
already_AddRefed<Promise> CreateImageBitmap(const ImageBitmapSource& aImage,
int32_t aSx, int32_t aSy,
int32_t aSw, int32_t aSh,
ErrorResult& aRv);

1
dom/xhr/XMLHttpRequest.h
View File

@ -63,7 +63,6 @@ class XMLHttpRequest : public XMLHttpRequestEventTarget {
virtual XMLHttpRequestUpload* GetUpload(ErrorResult& aRv) = 0;
virtual void Send(
JSContext* aCx,
const Nullable<
DocumentOrBlobOrArrayBufferViewOrArrayBufferOrFormDataOrURLSearchParamsOrUSVString>&
aData,

1
dom/xhr/XMLHttpRequestMainThread.cpp
View File

@ -2794,7 +2794,6 @@ void XMLHttpRequestMainThread::UnsuppressEventHandlingAndResume() {
}
void XMLHttpRequestMainThread::Send(
JSContext* aCx,
const Nullable<
DocumentOrBlobOrArrayBufferViewOrArrayBufferOrFormDataOrURLSearchParamsOrUSVString>&
aData,

1
dom/xhr/XMLHttpRequestMainThread.h
View File

@ -315,7 +315,6 @@ class XMLHttpRequestMainThread final : public XMLHttpRequest,
public:
virtual void Send(
JSContext* aCx,
const Nullable<
DocumentOrBlobOrArrayBufferViewOrArrayBufferOrFormDataOrURLSearchParamsOrUSVString>&
aData,

3
dom/xhr/XMLHttpRequestWorker.cpp
View File

@ -1301,7 +1301,7 @@ void SendRunnable::RunOnMainThread(ErrorResult& aRv) {
mProxy->mInnerChannelId++;
mProxy->mXHR->Send(nullptr, payload, aRv);
mProxy->mXHR->Send(payload, aRv);
if (!aRv.Failed()) {
mProxy->mOutstandingSendCount++;
@ -1853,7 +1853,6 @@ XMLHttpRequestUpload* XMLHttpRequestWorker::GetUpload(ErrorResult& aRv) {
}
void XMLHttpRequestWorker::Send(
JSContext* aCx,
const Nullable<
DocumentOrBlobOrArrayBufferViewOrArrayBufferOrFormDataOrURLSearchParamsOrUSVString>&
aData,

1
dom/xhr/XMLHttpRequestWorker.h
View File

@ -142,7 +142,6 @@ class XMLHttpRequestWorker final : public XMLHttpRequest {
virtual XMLHttpRequestUpload* GetUpload(ErrorResult& aRv) override;
virtual void Send(
JSContext* aCx,
const Nullable<
DocumentOrBlobOrArrayBufferViewOrArrayBufferOrFormDataOrURLSearchParamsOrUSVString>&
aData,