From ed3de8e8fc93e0d134e69adf956621f771237e1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabrice=20Desr=C3=A9?= Date: Fri, 16 Mar 2012 15:23:28 -0700 Subject: [PATCH] Bug 736113 - Can't get camera stream when camera app served from subdomain [r=vingtetun] --- b2g/components/CameraContent.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/components/CameraContent.js b/b2g/components/CameraContent.js index 65ad85a70af4..711db38982af 100644 --- a/b2g/components/CameraContent.js +++ b/b2g/components/CameraContent.js @@ -62,7 +62,7 @@ CameraContent.prototype = { let perm = principal == secMan.getSystemPrincipal() ? Ci.nsIPermissionManager.ALLOW_ACTION : Services.perms.testExactPermission(principal.URI, "content-camera"); //only pages with perm set and chrome pages can use the camera in content - this.hasPrivileges = perm == Ci.nsIPermissionManager.ALLOW_ACTION || from.schemeIs("chrome"); + this.hasPrivileges = perm == Ci.nsIPermissionManager.ALLOW_ACTION; Services.obs.addObserver(this, "inner-window-destroyed", false); let util = aWindow.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils);