Merge Debugger and Debug.

src/execution.cc

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "execution.h"
 
 #include "bootstrapper.h"
 #include "codegen.h"
 #include "deoptimizer.h"
 #include "isolate-inl.h"
@@ skipping 86 matching lines @@
 #ifdef VERIFY_HEAP
   value->ObjectVerify();
 #endif
 
   // Update the pending exception flag and return the value.
   bool has_exception = value->IsException();
   ASSERT(has_exception == isolate->has_pending_exception());
   if (has_exception) {
     isolate->ReportPendingMessages();
     // Reset stepping state when script exits with uncaught exception.
-    if (isolate->debugger()->is_active()) {
+    if (isolate->debug()->is_active()) {
       isolate->debug()->ClearStepping();
     }
     return MaybeHandle<Object>();
   } else {
     isolate->clear_pending_message();
   }
 
   return Handle<Object>(value, isolate);
 }
 
@@ skipping 537 matching lines @@
 
 
 void Execution::DebugBreakHelper(Isolate* isolate) {
   // Just continue if breaks are disabled.
   if (isolate->debug()->disable_break()) return;
 
   // Ignore debug break during bootstrapping.
   if (isolate->bootstrapper()->IsActive()) return;
 
   // Ignore debug break if debugger is not active.
-  if (!isolate->debugger()->is_active()) return;
+  if (!isolate->debug()->is_active()) return;
 
   StackLimitCheck check(isolate);
   if (check.HasOverflowed()) return;
 
   { JavaScriptFrameIterator it(isolate);
     ASSERT(!it.done());
     Object* fun = it.frame()->function();
     if (fun && fun->IsJSFunction()) {
       // Don't stop in builtin functions.
       if (JSFunction::cast(fun)->IsBuiltin()) return;
@@ skipping 20 matching lines @@
   StackLimitCheck check(isolate);
   if (check.HasOverflowed()) return;
 
   HandleScope scope(isolate);
   // Enter the debugger. Just continue if we fail to enter the debugger.
   EnterDebugger debugger(isolate);
   if (debugger.FailedToEnter()) return;
 
   // Notify the debug event listeners. Indicate auto continue if the break was
   // a debug command break.
-  isolate->debugger()->OnDebugBreak(isolate->factory()->undefined_value(),
-                                    debug_command_only);
+  isolate->debug()->OnDebugBreak(isolate->factory()->undefined_value(),
+                                 debug_command_only);
 }
 
 
 Object* StackGuard::HandleInterrupts() {
   bool has_api_interrupt = false;
   {
     ExecutionAccess access(isolate_);
     if (should_postpone_interrupts(access)) {
       return isolate_->heap()->undefined_value();
     }
@@ skipping 28 matching lines @@
 
   if (has_api_interrupt) {
     // Callback must be invoked outside of ExecusionAccess lock.
     isolate_->InvokeApiInterruptCallback();
   }
 
   return isolate_->heap()->undefined_value();
 }
 
 } }  // namespace v8::internal