wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

merge b2g-inbound to mozilla-central

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2013-08-16 10:32:10 +02:00
commit 9fb14e0482
6 changed files with 6 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
b2g/config/gaia.json
View File

@ -1,4 +1,4 @@
{
"revision": "9caa3c130cdfe2597d396d7fc4e70a2463d492ed",
"revision": "340f6676fc5dc34f1b9ab0c40169c0c4fd744587",
"repo_path": "/integration/gaia-central"
}

1
dom/camera/DOMCameraManager.cpp
View File

@ -80,7 +80,6 @@ nsDOMCameraManager::CheckPermission(nsPIDOMWindow* aWindow)
uint32_t permission = nsIPermissionManager::DENY_ACTION;
permMgr->TestPermissionFromWindow(aWindow, "camera", &permission);
if (permission != nsIPermissionManager::ALLOW_ACTION) {
NS_WARNING("No permission to access camera");
return false;
}

17
dom/ipc/ContentParent.cpp
View File

@ -2451,23 +2451,6 @@ ContentParent::RecvCloseAlert(const nsString& aName)
return true;
}
bool
ContentParent::RecvTestPermissionFromPrincipal(const IPC::Principal& aPrincipal,
const nsCString& aType,
uint32_t* permission)
{
nsCOMPtr<nsIPermissionManager> permissionManager =
do_GetService(NS_PERMISSIONMANAGER_CONTRACTID);
NS_ENSURE_TRUE(permissionManager, false);
nsresult rv = permissionManager->TestPermissionFromPrincipal(aPrincipal,
aType.get(),
permission);
NS_ENSURE_SUCCESS(rv, false);
return true;
}
bool
ContentParent::RecvSyncMessage(const nsString& aMsg,
const ClonedMessageData& aData,

4
dom/ipc/ContentParent.h
View File

@ -371,10 +371,6 @@ private:
virtual bool RecvCloseAlert(const nsString& aName);
virtual bool RecvTestPermissionFromPrincipal(const IPC::Principal& aPrincipal,
const nsCString& aType,
uint32_t* permission);
virtual bool RecvLoadURIExternal(const URIParams& uri);
virtual bool RecvSyncMessage(const nsString& aMsg,

16
dom/ipc/PContent.ipdl
View File

@ -344,22 +344,6 @@ parent:
CloseAlert(nsString name);
/**
* Tests permission for a provided principal using the permission
* manager.
*
* @param principal
* The principal to test for the permissions.
* @param type
* The type of permission to for the principal.
*
* NOTE: The principal is untrusted in the parent process. Only
* principals that can live in the content process should
* be provided.
*/
sync TestPermissionFromPrincipal(Principal principal, nsCString type)
returns (uint32_t permission);
PExternalHelperApp(OptionalURIParams uri, nsCString aMimeContentType,
nsCString aContentDisposition, bool aForceSave,
int64_t aContentLength, OptionalURIParams aReferrer);

20
dom/src/notification/Notification.cpp
View File

@ -3,9 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "PCOMContentPermissionRequestChild.h"
#include "mozilla/dom/PBrowserChild.h"
#include "mozilla/dom/Notification.h"
#include "mozilla/dom/ContentChild.h"
#include "mozilla/Preferences.h"
#include "TabChild.h"
#include "nsContentUtils.h"
@ -433,20 +431,12 @@ Notification::GetPermissionInternal(nsISupports* aGlobal, ErrorResult& aRv)
uint32_t permission = nsIPermissionManager::UNKNOWN_ACTION;
if (XRE_GetProcessType() == GeckoProcessType_Content) {
ContentChild* cpc = ContentChild::GetSingleton();
nsCOMPtr<nsIPermissionManager> permissionManager =
do_GetService(NS_PERMISSIONMANAGER_CONTRACTID);
cpc->SendTestPermissionFromPrincipal(IPC::Principal(principal),
NS_LITERAL_CSTRING("desktop-notification"),
&permission);
} else {
nsCOMPtr<nsIPermissionManager> permissionManager =
do_GetService(NS_PERMISSIONMANAGER_CONTRACTID);
permissionManager->TestPermissionFromPrincipal(principal,
"desktop-notification",
&permission);
}
permissionManager->TestPermissionFromPrincipal(principal,
"desktop-notification",
&permission);
// Convert the result to one of the enum types.
switch (permission) {