Changeset 427 for trunk/JavaScriptCore/API/JSBase.cpp

Timestamp:

08/01/08 14:47:24 (5 months ago)

Author:

sroret

Message:

merge with webkit revision 35510

Files:

• trunk/JavaScriptCore/API/JSBase.cpp (modified) (4 diffs)

trunk/JavaScriptCore/API/JSBase.cpp

@@ -34 +34 @@
-#include <kjs/interpreter.h>
-#include <kjs/JSGlobalObject.h>
-#include <kjs/JSLock.h>
-#include <kjs/JSObject.h>
-
@@ -43 +42 @@
-    ExecState* exec = toJS(ctx);
-    exec->globalData().heap->registerThread();
-    JSLock lock(exec);
-
-    JSObject* jsThisObject = toJS(thisObject);
@@ -70 +68 @@
-    ExecState* exec = toJS(ctx);
-    exec->globalData().heap->registerThread();
-    JSLock lock(exec);
-
-    UString::Rep* scriptRep = toJS(script);
@@ -98 +95 @@
-    Heap* heap = globalData.heap;
-
-    JSLock lock(globalData.isSharedInstance);
-
-    if (!heap->isBusy())
-        heap->collect();