Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make content policy api (nsIContentPolicy) not suck.

Browse Source 
bug 191839. Original patch and hard work by Tim <riceman+bmo@mail.rit.edu>, r=bzbarsky (on backend stuff), r=neil (on the tabbrowser stuff), sr=bzbarsky


git-svn-id: svn://10.0.0.236/trunk@156366 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mvl%exedo.nl
2004-05-13 18:34:18 +00:00
parent 246be1ca3b
commit c0b2e4667b
27 changed files with 1032 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mozilla/layout/generic/nsObjectFrame.cpp
View File

@@ -1240,11 +1240,10 @@ nsObjectFrame::InstantiatePlugin(nsIPresContext* aPresContext,
#endif
// Check to see if content-policy wants to veto this
if(aURI != nsnull)
if(aURI)
{
PRBool shouldLoad = PR_TRUE; // default permit
nsresult rv;
nsCOMPtr<nsIDOMElement> element = do_QueryInterface(mContent, &rv);
nsCOMPtr<nsIDOMNode> domNode = do_QueryInterface(mContent, &rv);
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIDocument> document;
@@ -1254,13 +1253,19 @@ nsObjectFrame::InstantiatePlugin(nsIPresContext* aPresContext,
if (! document)
return NS_ERROR_FAILURE;
nsCOMPtr<nsIDOMWindow> domWin(do_QueryInterface(document->GetScriptGlobalObject(), &rv));
nsIURI *docURI = document->GetDocumentURI();
//don't care if we can't get the originating URL
if (NS_SUCCEEDED(rv) &&
NS_SUCCEEDED(NS_CheckContentLoadPolicy(nsIContentPolicy::OBJECT,
aURI, element, domWin, &shouldLoad)) &&
!shouldLoad) {
return NS_OK;
PRInt16 shouldLoad = nsIContentPolicy::ACCEPT; // default permit
rv = NS_CheckContentLoadPolicy(nsIContentPolicy::TYPE_OBJECT,
aURI,
docURI,
domNode,
nsDependentCString(aMimetype ? aMimetype : ""),
nsnull, //extra
&shouldLoad);
if (NS_FAILED(rv) || NS_CP_REJECTED(shouldLoad)) {
return NS_CONTENT_BLOCKED_SHOW_ALT;
}
}