mozilla-central: changeset 119246:aa20a6097d0b4e274fd1999bedd13e18f2a513fc

☠☠ backed out by 3702b7ead05e ☠ ☠
author	Alexandre Poirot <poirot.alex@gmail.com>
	Fri, 18 Jan 2013 11:04:40 +0100
changeset 119246	aa20a6097d0b4e274fd1999bedd13e18f2a513fc
parent 119245	c2636bf84b4bd402b5b0e28ca6b803ce8c09769e
child 119247	3657968244936545c96954dda2046219d99f6d30
push id	24195
push user	Ms2ger@gmail.com
push date	Sat, 19 Jan 2013 16:10:11 +0000
treeherder	mozilla-central@02e12a80aef9 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	sicking
bugs	830983
milestone	21.0a1
first release with	nightly linux32 01c964705be7 / 21.0a1 / 20130121020044 / files nightly linux64 01c964705be7 / 21.0a1 / 20130121020044 / files nightly mac 01c964705be7 / 21.0a1 / 20130121020044 / files nightly win32 01c964705be7 / 21.0a1 / 20130121020044 / files nightly win64 a207f33adc1a / 21.0a1 / 20130125031018 / files
last release without	nightly linux32 b52c02f77cf5 / 21.0a1 / 20130118030915 / files nightly linux64 b52c02f77cf5 / 21.0a1 / 20130118030915 / files nightly mac b52c02f77cf5 / 21.0a1 / 20130118030915 / files nightly win32 b52c02f77cf5 / 21.0a1 / 20130118030915 / files nightly win64 7bce868864bf / 21.0a1 / 20130109030942 / files

--- a/extensions/cookie/nsPermissionManager.cpp
+++ b/extensions/cookie/nsPermissionManager.cpp
@@ -1226,16 +1226,19 @@ nsPermissionManager::RemovePermissionsFo
     nsAutoCString host;
     bool isInBrowserElement;
     nsAutoCString type;
 
     data.permissions[i]->GetHost(host);
     data.permissions[i]->GetIsInBrowserElement(&isInBrowserElement);
     data.permissions[i]->GetType(type);
 
+    if (aBrowserOnly && !isInBrowserElement)
+      continue;
+
     nsCOMPtr<nsIPrincipal> principal;
     if (NS_FAILED(GetPrincipal(host, aAppId, isInBrowserElement,
                                getter_AddRefs(principal)))) {
       NS_ERROR("GetPrincipal() failed!");
       continue;
     }
 
     AddInternal(principal,