Changeset 28458 in webkit for trunk/JavaScriptCore/kjs/function.cpp

Timestamp:

Dec 5, 2007, 2:48:48 PM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Geoff.

• Wait until local variable data is fully constructed before notifying the debugger of entering or leaving a call frame.

• kjs/function.cpp: (KJS::FunctionImp::callAsFunction):
• kjs/nodes.cpp: (KJS::FunctionBodyNode::execute):

File:

• trunk/JavaScriptCore/kjs/function.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/function.cpp

@@ -78 +78 @@
     newExec.setException(exec->exception());
 
-  Debugger* dbg = exec->dynamicInterpreter()->debugger();
-  int sourceId = -1;
-  int lineNo = -1;
-  if (dbg) {
-    sourceId = body->sourceId();
-    lineNo = body->firstLine();
-
-    bool cont = dbg->callEvent(&newExec, sourceId, lineNo, this, args);
-    if (!cont) {
-      dbg->imp()->abort();
-      return jsUndefined();
-    }
-  }
-
   Completion comp = execute(&newExec);
 
@@ -97 +83 @@
   if (newExec.hadException())
     comp = Completion(Throw, newExec.exception());
-
-  // The debugger may have been deallocated by now if the WebFrame
-  // we were running in has been destroyed, so refetch it.
-  // See http://bugs.webkit.org/show_bug.cgi?id=9477
-  dbg = exec->dynamicInterpreter()->debugger();
-
-  if (dbg) {
-    lineNo = body->lastLine();
-
-    if (comp.complType() == Throw)
-        newExec.setException(comp.value());
-
-    int cont = dbg->returnEvent(&newExec, sourceId, lineNo, this);
-    if (!cont) {
-      dbg->imp()->abort();
-      return jsUndefined();
-    }
-  }
 
   if (comp.complType() == Throw) {