diff options
| author | Moonchild <moonchild@palemoon.org> | 2021-02-25 01:03:57 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2021-02-25 01:03:57 +0000 |
| commit | ceadffab6b357723981a429e11222daf6cd6dcfb (patch) | |
| tree | 5603053048d6a460f79b22bdf165fb74d32d39b0 /dom/html | |
| parent | 14fb2f966e9b54598c451e3cb35b4aa0480dafed (diff) | |
| parent | ad5a13bd501e379517da1a944c104a11d951a3f5 (diff) | |
| download | UXP-RC_20210225.tar UXP-RC_20210225.tar.gz UXP-RC_20210225.tar.lz UXP-RC_20210225.tar.xz UXP-RC_20210225.zip | |
Merge branch 'master' into releaseRC_20210225
Diffstat (limited to 'dom/html')
| -rw-r--r-- | dom/html/HTMLInputElement.cpp | 2 | ||||
| -rw-r--r-- | dom/html/HTMLMediaElement.cpp | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/dom/html/HTMLInputElement.cpp b/dom/html/HTMLInputElement.cpp index 86d03d8f5..557e673e1 100644 --- a/dom/html/HTMLInputElement.cpp +++ b/dom/html/HTMLInputElement.cpp @@ -866,7 +866,7 @@ HTMLInputElement::InitFilePicker(FilePickerType aType) mode = static_cast<int16_t>(nsIFilePicker::modeOpen); } - nsresult rv = filePicker->Init(win, title, mode); + nsresult rv = filePicker->Init(win, title, mode, /*aRequireInteraction = */ true); NS_ENSURE_SUCCESS(rv, rv); if (!okButtonLabel.IsEmpty()) { diff --git a/dom/html/HTMLMediaElement.cpp b/dom/html/HTMLMediaElement.cpp index 0828208f6..1ff1fd7a4 100644 --- a/dom/html/HTMLMediaElement.cpp +++ b/dom/html/HTMLMediaElement.cpp @@ -4614,8 +4614,12 @@ void HTMLMediaElement::DecodeError(const MediaResult& aError) } } else if (mReadyState == nsIDOMHTMLMediaElement::HAVE_NOTHING) { NoSupportedMediaSourceError(aError.Description()); - } else { + } else if (IsCORSSameOrigin()) { Error(MEDIA_ERR_DECODE, aError.Description()); + } else { + nsAutoCString eMessage; + eMessage.AssignLiteral("Failed to decode media"); + Error(MEDIA_ERR_DECODE, eMessage); } } |