Changeset 447 for trunk/JavaScriptCore/kjs/JSGlobalObject.cpp

Timestamp:

08/20/08 13:23:52 (5 months ago)

Author:

mbensi

Message:

merge with webkit revision 35853

Files:

• trunk/JavaScriptCore/kjs/JSGlobalObject.cpp (modified) (3 diffs)

trunk/JavaScriptCore/kjs/JSGlobalObject.cpp

@@ -44 +44 @@
-#include "GlobalEvalFunction.h"
-#include "JSGlobalObjectFunctions.h"
+#include "JSLock.h"
-#include "Machine.h"
-#include "MathObject.h"
@@ -79 +80 @@
-JSGlobalObject::~JSGlobalObject()
-{
+    ASSERT(JSLock::currentThreadIsHoldingLock());
+
-    if (d()->debugger)
-        d()->debugger->detach(this);
@@ -110 +113 @@
-void JSGlobalObject::init(JSObject* thisValue)
-{
+    ASSERT(JSLock::currentThreadIsHoldingLock());
+
-    d()->globalData = Heap::heap(this)->globalData();
-