Changeset 30679 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Feb 29, 2008, 3:48:42 PM (17 years ago)

Author:

Adam Roben

Message:

Remove unused DebuggerImp::abort and DebuggerImp::aborted

Reviewed by Tim and Sam.

• kjs/function_object.cpp: (KJS::FunctionObjectImp::construct):
• kjs/internal.h: (KJS::DebuggerImp::DebuggerImp):
• kjs/nodes.cpp: (KJS::Node::handleException): (KJS::FunctionBodyNodeWithDebuggerHooks::execute):

Location:

trunk/JavaScriptCore/kjs

Files:

• function_object.cpp (modified) (1 diff)
• internal.h (modified) (1 diff)
• nodes.cpp (modified) (3 diffs)

trunk/JavaScriptCore/kjs/function_object.cpp

@@ -169 +169 @@
 
     // notify debugger that source has been parsed
+    // send empty sourceURL to indicate constructed code
     Debugger* dbg = exec->dynamicGlobalObject()->debugger();
-    if (dbg) {
-        // send empty sourceURL to indicate constructed code
-        bool cont = dbg->sourceParsed(exec, sourceId, UString(), body, lineNumber, errLine, errMsg);
-        if (!cont) {
-            dbg->imp()->abort();
-            return new JSObject();
-        }
-    }
+    if (dbg && !dbg->sourceParsed(exec, sourceId, UString(), body, lineNumber, errLine, errMsg))
+        return new JSObject();
 
     // No program node == syntax error - throw a syntax error

trunk/JavaScriptCore/kjs/internal.h

@@ -104 +104 @@
     DebuggerImp() {
       globalObjects = 0;
-      isAborted = false;
     }
 
-    void abort() { isAborted = true; }
-    bool aborted() const { return isAborted; }
-
     AttachedGlobalObject* globalObjects;
-    bool isAborted;
   };
 

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -366 +366 @@
     }
     Debugger* dbg = exec->dynamicGlobalObject()->debugger();
-    if (dbg && !dbg->hasHandledException(exec, exceptionValue)) {
-        bool cont = dbg->exception(exec, currentSourceId(exec), m_line, exceptionValue);
-        if (!cont)
-            dbg->imp()->abort();
-    }
+    if (dbg && !dbg->hasHandledException(exec, exceptionValue))
+        dbg->exception(exec, currentSourceId(exec), m_line, exceptionValue);
 }
 
@@ -4634 +4631 @@
 {
     if (Debugger* dbg = exec->dynamicGlobalObject()->debugger()) {
-        if (!dbg->callEvent(exec, sourceId(), lineNo(), exec->function(), *exec->arguments())) {
-            dbg->imp()->abort();
+        if (!dbg->callEvent(exec, sourceId(), lineNo(), exec->function(), *exec->arguments()))
             return exec->setInterruptedCompletion();
-        }
     }
 
@@ -4645 +4640 @@
         if (exec->completionType() == Throw)
             exec->setException(result);
-        if (!dbg->returnEvent(exec, sourceId(), lineNo(), exec->function())) {
-            dbg->imp()->abort();
+        if (!dbg->returnEvent(exec, sourceId(), lineNo(), exec->function()))
             return exec->setInterruptedCompletion();
-        }
     }