Changeset 427 for trunk/JavaScriptCore/kjs/Shell.cpp

Timestamp:

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

Author:

sroret

Message:

merge with webkit revision 35510

Files:

• trunk/JavaScriptCore/kjs/Shell.cpp (modified) (5 diffs)

trunk/JavaScriptCore/kjs/Shell.cpp

@@ -31 +31 @@
-#include "JSFunction.h"
-#include "JSGlobalObject.h"
-#include "JSLock.h"
-#include "JSObject.h"
-#include "Parser.h"
-#include "PrototypeFunction.h"
+#include "SamplingTool.h"
-#include "collector.h"
-#include "completion.h"
@@ -208 +208 @@
-JSValue* functionGC(ExecState* exec, JSObject*, JSValue*, const ArgList&)
-{
-    JSLock lock(false);
-    exec->heap()->collect();
-    return jsUndefined();
@@ -340 +339 @@
-            prettyPrintScript(globalObject->globalExec(), fileName, script);
-        else {
-SAMPLING_TOOL_ENABLED
+ENABLE(SAMPLING_TOOL)
-            Machine* machine = globalObject->globalData()->machine;
-            machine->m_sampler = new SamplingTool();
@@ -355 +354 @@
-            }
-
-SAMPLING_TOOL_ENABLED
+ENABLE(SAMPLING_TOOL)
-            machine->m_sampler->stop();
-            machine->m_sampler->dump(globalObject->globalExec());
@@ -460 +459 @@
-    KJS::initializeThreading();
-
-    JSLock lock(false);
-
-    Options options;
-    parseArguments(argc, argv, options);