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

Resolve relative URLs on CODEBASE, bug 184458 r=adamlock sr=darin

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@136177 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
peterlubczynski%netscape.com
2003-01-10 21:59:02 +00:00
parent 883ef02946
commit 6e83004b81
1 changed files with 42 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
mozilla/embedding/browser/activex/src/plugin/LegacyPlugin.cpp
View File

@@ -54,6 +54,14 @@
#include "LegacyPlugin.h"
#ifdef XPC_IDISPATCH_SUPPORT
#include "nsCOMPtr.h"
#include "nsString.h"
#include "nsIDocument.h"
#include "nsIDOMElement.h"
#include "nsIDOMDocument.h"
#include "nsIURI.h"
#endif
///////////////////////////////////////////////////////////////////////////////
// These are constants to control certain default behaviours
@@ -696,6 +704,40 @@ NewControl(const char *pluginType,
else if (stricmp(argn[i], "CODEBASE") == 0)
{
codebase = argv[i];
#ifdef XPC_IDISPATCH_SUPPORT
// resolve relative URLs on CODEBASE
if (argv[i])
{
nsCOMPtr<nsIDOMElement> element;
NPN_GetValue(pData->pPluginInstance, NPNVDOMElement, (void *) &element);
if (element)
{
nsCOMPtr<nsIDOMNode> tagAsNode (do_QueryInterface(element));
if (tagAsNode)
{
nsCOMPtr<nsIDOMDocument> DOMdocument;
tagAsNode->GetOwnerDocument(getter_AddRefs(DOMdocument));
// XXX nsIDocument is not frozen!!!
nsCOMPtr<nsIDocument> doc(do_QueryInterface(DOMdocument));
if (doc)
{
nsCOMPtr<nsIURI> baseURI;
doc->GetBaseURL(*getter_AddRefs(baseURI));
if (baseURI)
{
nsCAutoString newURL;
if (NS_SUCCEEDED(baseURI->Resolve(nsDependentCString(argv[i]), newURL)))
{
codebase = newURL.get();
}
}
}
}
}
}
#endif
}
else
{