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

Bug 341915: can we move nsIScriptContext(Owner) from dom to xpconnect

Browse Source 
r=timeless, sr=jst


git-svn-id: svn://10.0.0.236/trunk@203077 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mhammond%skippinet.com.au
2006-07-19 04:15:50 +00:00
parent d5b72ca1ba
commit 7016d67f13
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mozilla/extensions/python/dom/src/nsPyContext.cpp
View File

@@ -288,7 +288,7 @@ nsPythonContext::InitContext(nsIScriptGlobalObject *aGlobalObject)
}
void
nsPythonContext::DidSetDocument(nsIDOMDocument *aDoc, void *aGlobal)
nsPythonContext::DidSetDocument(nsISupports *aSupDoc, void *aGlobal)
{
NS_TIMELINE_MARK_FUNCTION("nsPythonContext::DidSetDocument");
NS_ASSERTION(mDelegate != NULL, "No delegate");
@@ -298,9 +298,12 @@ nsPythonContext::DidSetDocument(nsIDOMDocument *aDoc, void *aGlobal)
CEnterLeavePython _celp;
PyObject *obDoc;
if (aDoc) {
obDoc = PyObject_FromNSDOMInterface(mDelegate, aDoc,
NS_GET_IID(nsIDOMDocument));
if (aSupDoc) {
nsCOMPtr<nsIDOMDocument> doc(do_QueryInterface(aSupDoc));
NS_ASSERTION(nsnull != doc, "not an nsIDOMDocument!?");
if (nsnull != doc)
obDoc = PyObject_FromNSDOMInterface(mDelegate, aSupDoc,
NS_GET_IID(nsIDOMDocument));
if (!obDoc) {
HandlePythonError();
return;

2
mozilla/extensions/python/dom/src/nsPyContext.h
View File

@@ -204,7 +204,7 @@ public:
virtual void WillInitializeContext();
virtual void DidInitializeContext();
virtual void DidSetDocument(nsIDOMDocument *aDocdoc, void *aGlobal);
virtual void DidSetDocument(nsISupports *aDocdoc, void *aGlobal);
virtual nsresult Serialize(nsIObjectOutputStream* aStream, void *aScriptObject);
virtual nsresult Deserialize(nsIObjectInputStream* aStream,