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

Bug 1733109 - function 'mozilla::dom::HTMLMediaElement::MozGetMetadata' has a definition with different parameter names in HTMLMediaElement.cpp. r=alwu

Browse Source 
Depends on D126946

Differential Revision: https://phabricator.services.mozilla.com/D126947
This commit is contained in:
Paul Adenot
2021-09-30 12:36:18 +00:00
parent 054d2b2d5c
commit 51bf8da007
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dom/html/HTMLMediaElement.cpp
View File

@@ -3370,15 +3370,15 @@ void HTMLMediaElement::SetVolume(double aVolume, ErrorResult& aRv) {
PauseIfShouldNotBePlaying();
}
void HTMLMediaElement::MozGetMetadata(JSContext* cx,
JS::MutableHandle<JSObject*> aRetval,
void HTMLMediaElement::MozGetMetadata(JSContext* aCx,
JS::MutableHandle<JSObject*> aResult,
ErrorResult& aRv) {
if (mReadyState < HAVE_METADATA) {
aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
return;
}
JS::Rooted<JSObject*> tags(cx, JS_NewPlainObject(cx));
JS::Rooted<JSObject*> tags(aCx, JS_NewPlainObject(aCx));
if (!tags) {
aRv.Throw(NS_ERROR_FAILURE);
return;
@@ -3387,10 +3387,10 @@ void HTMLMediaElement::MozGetMetadata(JSContext* cx,
for (const auto& entry : *mTags) {
nsString wideValue;
CopyUTF8toUTF16(entry.GetData(), wideValue);
JS::Rooted<JSString*> string(cx,
JS_NewUCStringCopyZ(cx, wideValue.Data()));
if (!string || !JS_DefineProperty(cx, tags, entry.GetKey().Data(), string,
JSPROP_ENUMERATE)) {
JS::Rooted<JSString*> string(aCx,
JS_NewUCStringCopyZ(aCx, wideValue.Data()));
if (!string || !JS_DefineProperty(aCx, tags, entry.GetKey().Data(),
string, JSPROP_ENUMERATE)) {
NS_WARNING("couldn't create metadata object!");
aRv.Throw(NS_ERROR_FAILURE);
return;
@@ -3398,7 +3398,7 @@ void HTMLMediaElement::MozGetMetadata(JSContext* cx,
}
}
aRetval.set(tags);
aResult.set(tags);
}
void HTMLMediaElement::SetMutedInternal(uint32_t aMuted) {