corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out 8 changesets (bug 1044736) r=bustage

Browse Source 
Backed out changeset 920775ddfb85 (bug 1044736)
Backed out changeset a3604ab2b3ca (bug 1044736)
Backed out changeset fb6a60700803 (bug 1044736)
Backed out changeset 7037d2b40d39 (bug 1044736)
Backed out changeset 1b55f80e1ca6 (bug 1044736)
Backed out changeset f55ff90f2b6f (bug 1044736)
Backed out changeset 8505276285fa (bug 1044736)
Backed out changeset e81aa95ac8d3 (bug 1044736)
This commit is contained in:
Kan-Ru Chen (陳侃如)
2014-11-12 15:10:27 +08:00
parent 20558507b5
commit 6d134c35cc
19 changed files with 387 additions and 1284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dom/html/nsGenericHTMLFrameElement.cpp
View File

@@ -34,7 +34,6 @@ NS_IMPL_CYCLE_COLLECTION_CLASS(nsGenericHTMLFrameElement)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsGenericHTMLFrameElement,
nsGenericHTMLElement)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mFrameLoader)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mBrowserElementAPI)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
NS_IMPL_ADDREF_INHERITED(nsGenericHTMLFrameElement, nsGenericHTMLElement)
@@ -307,10 +306,6 @@ nsGenericHTMLFrameElement::GetReallyIsBrowserOrApp(bool *aOut)
uint32_t permission = nsIPermissionManager::DENY_ACTION;
nsresult rv = permMgr->TestPermissionFromPrincipal(principal, "browser", &permission);
NS_ENSURE_SUCCESS(rv, NS_OK);
if (permission != nsIPermissionManager::ALLOW_ACTION) {
rv = permMgr->TestPermissionFromPrincipal(principal, "embed-widgets", &permission);
NS_ENSURE_SUCCESS(rv, NS_OK);
}
*aOut = permission == nsIPermissionManager::ALLOW_ACTION;
return NS_OK;
}