From 212b213c9ced170b8564ad243f7e9f30bd14084a Mon Sep 17 00:00:00 2001 From: "vidur%netscape.com" Date: Mon, 9 Aug 1999 19:14:49 +0000 Subject: [PATCH] changed name of NS_CreateContext to NS_CreateScriptContext git-svn-id: svn://10.0.0.236/trunk@42780 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsWebShell.cpp | 2 +- mozilla/dom/public/nsIScriptContext.h | 2 +- mozilla/dom/src/base/nsJSEnvironment.cpp | 3 ++- mozilla/webshell/src/nsWebShell.cpp | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp index 45c4bc67614..f4b97800471 100644 --- a/mozilla/docshell/base/nsWebShell.cpp +++ b/mozilla/docshell/base/nsWebShell.cpp @@ -3161,7 +3161,7 @@ nsWebShell::CreateScriptEnvironment() } if (nsnull == mScriptContext) { - res = NS_CreateContext(mScriptGlobal, &mScriptContext); + res = NS_CreateScriptContext(mScriptGlobal, &mScriptContext); } return res; diff --git a/mozilla/dom/public/nsIScriptContext.h b/mozilla/dom/public/nsIScriptContext.h index db8a9e9cd35..713a30fa805 100644 --- a/mozilla/dom/public/nsIScriptContext.h +++ b/mozilla/dom/public/nsIScriptContext.h @@ -155,7 +155,7 @@ public: * Return a new Context * */ -extern "C" NS_DOM nsresult NS_CreateContext(nsIScriptGlobalObject *aGlobal, nsIScriptContext **aContext); +extern "C" NS_DOM nsresult NS_CreateScriptContext(nsIScriptGlobalObject *aGlobal, nsIScriptContext **aContext); #endif // nsIScriptContext_h__ diff --git a/mozilla/dom/src/base/nsJSEnvironment.cpp b/mozilla/dom/src/base/nsJSEnvironment.cpp index 4cc251a457c..3f969970e85 100644 --- a/mozilla/dom/src/base/nsJSEnvironment.cpp +++ b/mozilla/dom/src/base/nsJSEnvironment.cpp @@ -467,7 +467,8 @@ nsIScriptContext* nsJSEnvironment::GetNewContext() return context; } -extern "C" NS_DOM nsresult NS_CreateContext(nsIScriptGlobalObject *aGlobal, nsIScriptContext **aContext) +extern "C" NS_DOM nsresult NS_CreateScriptContext(nsIScriptGlobalObject *aGlobal, + nsIScriptContext **aContext) { nsresult rv = NS_OK; nsJSEnvironment *environment = nsJSEnvironment::GetScriptingEnvironment(); diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp index 45c4bc67614..f4b97800471 100644 --- a/mozilla/webshell/src/nsWebShell.cpp +++ b/mozilla/webshell/src/nsWebShell.cpp @@ -3161,7 +3161,7 @@ nsWebShell::CreateScriptEnvironment() } if (nsnull == mScriptContext) { - res = NS_CreateContext(mScriptGlobal, &mScriptContext); + res = NS_CreateScriptContext(mScriptGlobal, &mScriptContext); } return res;