Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-03 02:25:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 827145 - When no A/V devices are available, return that error to the page's getUserMedia callbacks. r=jesup

Browse Source
This commit is contained in:
Justin Dolske 2013-02-15 19:22:27 -08:00
parent 22acf5597b
commit c59a1abd14
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
browser/modules/webrtcUI.jsm
View File

@ -78,6 +78,12 @@ function handleRequest(aSubject, aTopic, aData) {
prompt(browser, callID, params.audio, params.video, devices);
},
function (error) {
// bug 827146 -- In the future, the UI should catch NO_DEVICES_FOUND
// and allow the user to plug in a device, instead of immediately failing.
let msg = Cc["@mozilla.org/supports-string;1"].
createInstance(Ci.nsISupportsString);
msg.data = error;
Services.obs.notifyObservers(msg, "getUserMedia:response:deny", callID);
Cu.reportError(error);
}
);

22
dom/media/MediaManager.cpp
View File

@ -61,7 +61,7 @@ public:
ErrorCallbackRunnable(
already_AddRefed<nsIDOMGetUserMediaSuccessCallback> aSuccess,
already_AddRefed<nsIDOMGetUserMediaErrorCallback> aError,
const nsString& aErrorMsg, uint64_t aWindowID)
const nsAString& aErrorMsg, uint64_t aWindowID)
: mSuccess(aSuccess)
, mError(aError)
, mErrorMsg(aErrorMsg)
@ -553,7 +553,7 @@ public:
}
nsresult
Denied()
Denied(const nsAString& aErrorMsg)
{
// We add a disabled listener to the StreamListeners array until accepted
// If this was the only active MediaStream, remove the window from the list.
@ -561,7 +561,7 @@ public:
// This is safe since we're on main-thread, and the window can only
// be invalidated from the main-thread (see OnNavigation)
nsCOMPtr<nsIDOMGetUserMediaErrorCallback> error(mError);
error->OnError(NS_LITERAL_STRING("PERMISSION_DENIED"));
error->OnError(aErrorMsg);
// Should happen *after* error runs for consistency, but may not matter
nsRefPtr<MediaManager> manager(MediaManager::GetInstance());
@ -570,7 +570,7 @@ public:
// This will re-check the window being alive on main-thread
// Note: we must remove the listener on MainThread as well
NS_DispatchToMainThread(new ErrorCallbackRunnable(
mSuccess, mError, NS_LITERAL_STRING("PERMISSION_DENIED"), mWindowID
mSuccess, mError, aErrorMsg, mWindowID
));
// MUST happen after ErrorCallbackRunnable Run()s, as it checks the active window list
@ -1197,7 +1197,7 @@ MediaManager::Observe(nsISupports* aSubject, const char* aTopic,
array->Count(&len);
MOZ_ASSERT(len);
if (!len) {
gUMRunnable->Denied(); // neither audio nor video were selected
gUMRunnable->Denied(NS_LITERAL_STRING("PERMISSION_DENIED")); // neither audio nor video were selected
return NS_OK;
}
for (uint32_t i = 0; i < len; i++) {
@ -1225,6 +1225,16 @@ MediaManager::Observe(nsISupports* aSubject, const char* aTopic,
}
if (!strcmp(aTopic, "getUserMedia:response:deny")) {
nsString errorMessage(NS_LITERAL_STRING("PERMISSION_DENIED"));
if (aSubject) {
nsCOMPtr<nsISupportsString> msg(do_QueryInterface(aSubject));
MOZ_ASSERT(msg);
msg->GetData(errorMessage);
if (errorMessage.IsEmpty())
errorMessage.Assign(NS_LITERAL_STRING("UNKNOWN_ERROR"));
}
nsString key(aData);
nsRefPtr<nsRunnable> runnable;
if (!mActiveCallbacks.Get(key, getter_AddRefs(runnable))) {
@ -1234,7 +1244,7 @@ MediaManager::Observe(nsISupports* aSubject, const char* aTopic,
GetUserMediaRunnable* gUMRunnable =
static_cast<GetUserMediaRunnable*>(runnable.get());
gUMRunnable->Denied();
gUMRunnable->Denied(errorMessage);
return NS_OK;
}