From 0b0de7e5d885083b4e2ea177991588216197ecf9 Mon Sep 17 00:00:00 2001
From: "joki%netscape.com"
 <joki%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 24 Jul 1998 05:07:51 +0000
Subject: [PATCH] Adding GetScriptGlobalObject function to
 nsIScriptContextOwner interface

git-svn-id: svn://10.0.0.236/trunk@6378 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/docshell/base/nsWebShell.cpp | 18 ++++++++++++++++++
 mozilla/webshell/src/nsWebShell.cpp  | 18 ++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp
index 93001ffa749..8919457aae6 100644
--- a/mozilla/docshell/base/nsWebShell.cpp
+++ b/mozilla/docshell/base/nsWebShell.cpp
@@ -137,6 +137,7 @@ public:
 
   // nsIScriptContextOwner
   NS_IMETHOD GetScriptContext(nsIScriptContext **aContext);
+  NS_IMETHOD GetScriptGlobalObject(nsIScriptGlobalObject **aGlobal);
   NS_IMETHOD ReleaseScriptContext(nsIScriptContext *aContext);
 
   // nsWebShell
@@ -1051,6 +1052,23 @@ nsWebShell::GetScriptContext(nsIScriptContext** aContext)
   return res;
 }
 
+nsresult 
+nsWebShell::GetScriptGlobalObject(nsIScriptGlobalObject** aGlobal)
+{
+  NS_PRECONDITION(nsnull != aGlobal, "null arg");
+  nsresult res = NS_OK;
+
+  if (nsnull == mScriptGlobal) {
+    res = NS_NewScriptGlobalObject(&mScriptGlobal);
+    if (NS_OK != res) {
+      return res;
+    }
+  }
+  *aGlobal = mScriptGlobal;
+
+  return res;
+}
+
 nsresult 
 nsWebShell::ReleaseScriptContext(nsIScriptContext *aContext)
 {
diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp
index 93001ffa749..8919457aae6 100644
--- a/mozilla/webshell/src/nsWebShell.cpp
+++ b/mozilla/webshell/src/nsWebShell.cpp
@@ -137,6 +137,7 @@ public:
 
   // nsIScriptContextOwner
   NS_IMETHOD GetScriptContext(nsIScriptContext **aContext);
+  NS_IMETHOD GetScriptGlobalObject(nsIScriptGlobalObject **aGlobal);
   NS_IMETHOD ReleaseScriptContext(nsIScriptContext *aContext);
 
   // nsWebShell
@@ -1051,6 +1052,23 @@ nsWebShell::GetScriptContext(nsIScriptContext** aContext)
   return res;
 }
 
+nsresult 
+nsWebShell::GetScriptGlobalObject(nsIScriptGlobalObject** aGlobal)
+{
+  NS_PRECONDITION(nsnull != aGlobal, "null arg");
+  nsresult res = NS_OK;
+
+  if (nsnull == mScriptGlobal) {
+    res = NS_NewScriptGlobalObject(&mScriptGlobal);
+    if (NS_OK != res) {
+      return res;
+    }
+  }
+  *aGlobal = mScriptGlobal;
+
+  return res;
+}
+
 nsresult 
 nsWebShell::ReleaseScriptContext(nsIScriptContext *aContext)
 {