Changeset 36244 in webkit for trunk/JavaScriptCore/kjs/ScopeChain.h

Timestamp:

Sep 6, 2008, 10:44:58 PM (17 years ago)

Author:

[email protected]

Message:

Merge squirrelfish-extreme to trunk.

File:

• trunk/JavaScriptCore/kjs/ScopeChain.h (modified) (2 diffs)

trunk/JavaScriptCore/kjs/ScopeChain.h

@@ -147 +147 @@
     }
 
+    class NoScopeChain {};
+
     class ScopeChain {
     public:
+        ScopeChain(NoScopeChain)
+            : m_node(0)
+        {
+        }
+
         ScopeChain(JSObject* o, JSObject* globalThis)
             : m_node(new ScopeChainNode(0, o, globalThis))
@@ -165 +172 @@
         {
         }
-    
-        ~ScopeChain() { m_node->deref(); }
+
+        ~ScopeChain()
+        {
+            if (m_node)
+                m_node->deref();
+        }
 
         void swap(ScopeChain&);