Bug 671185 - Incorrect return of NS_ERROR_* codes in functions returning PRBool, r=mak,ehsan,taras,biesi,pike,khuey,dholbert,josh,bjacob,bsmith
This commit is contained in:
@@ -189,7 +189,7 @@ PRBool CapturePickerAcceptCallback(const nsAString& aAccept, void* aClosure)
|
||||
NS_LITERAL_STRING("image/"))) {
|
||||
rv = closure->picker->ModeMayBeAvailable(nsICapturePicker::MODE_STILL,
|
||||
&captureEnabled);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
NS_ENSURE_SUCCESS(rv, PR_TRUE);
|
||||
if (captureEnabled) {
|
||||
*closure->mode = nsICapturePicker::MODE_STILL;
|
||||
return PR_FALSE;
|
||||
@@ -198,7 +198,7 @@ PRBool CapturePickerAcceptCallback(const nsAString& aAccept, void* aClosure)
|
||||
NS_LITERAL_STRING("audio/"))) {
|
||||
rv = closure->picker->ModeMayBeAvailable(nsICapturePicker::MODE_AUDIO_CLIP,
|
||||
&captureEnabled);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
NS_ENSURE_SUCCESS(rv, PR_TRUE);
|
||||
if (captureEnabled) {
|
||||
*closure->mode = nsICapturePicker::MODE_AUDIO_CLIP;
|
||||
return PR_FALSE;
|
||||
@@ -207,17 +207,17 @@ PRBool CapturePickerAcceptCallback(const nsAString& aAccept, void* aClosure)
|
||||
NS_LITERAL_STRING("video/"))) {
|
||||
rv = closure->picker->ModeMayBeAvailable(nsICapturePicker::MODE_VIDEO_CLIP,
|
||||
&captureEnabled);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
NS_ENSURE_SUCCESS(rv, PR_TRUE);
|
||||
if (captureEnabled) {
|
||||
*closure->mode = nsICapturePicker::MODE_VIDEO_CLIP;
|
||||
return PR_FALSE;
|
||||
}
|
||||
rv = closure->picker->ModeMayBeAvailable(nsICapturePicker::MODE_VIDEO_NO_SOUND_CLIP,
|
||||
&captureEnabled);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
NS_ENSURE_SUCCESS(rv, PR_TRUE);
|
||||
if (captureEnabled) {
|
||||
*closure->mode = nsICapturePicker::MODE_VIDEO_NO_SOUND_CLIP;
|
||||
return PR_FALSE;;
|
||||
return PR_FALSE;
|
||||
}
|
||||
}
|
||||
return PR_TRUE;
|
||||
|
||||
Reference in New Issue
Block a user