Bigger stepping granularity in debugging

runtime/vm/debugger.h

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #ifndef VM_DEBUGGER_H_
 #define VM_DEBUGGER_H_
 
 #include "vm/object.h"
 
 namespace dart {
@@ skipping 248 matching lines @@
     kStepOver,
     kStepInto,
     kStepOut
   };
 
   void EnsureFunctionIsDeoptimized(const Function& func);
   void InstrumentForStepping(const Function& target_function);
   SourceBreakpoint* SetBreakpoint(const Function& target_function,
                                   intptr_t token_index);
   void RemoveInternalBreakpoints();
-  void RemoveCodeBreakpoints(SourceBreakpoint* src_bpt);
+  void UnlinkCodeBreakpoints(SourceBreakpoint* src_bpt);
   void RegisterSourceBreakpoint(SourceBreakpoint* bpt);
   void RegisterCodeBreakpoint(CodeBreakpoint* bpt);
   SourceBreakpoint* GetSourceBreakpoint(const Function& func,
                                         intptr_t token_index);
   CodeBreakpoint* MakeCodeBreakpoint(const Function& func,
                                      intptr_t token_index);
 
   // Returns NULL if no breakpoint exists for the given address.
   CodeBreakpoint* GetCodeBreakpoint(uword breakpoint_address);
 
   void SyncBreakpoint(SourceBreakpoint* bpt);
 
   void SignalBpResolved(SourceBreakpoint *bpt);
 
+  bool IsDebuggable(const Function& func);
+
   intptr_t nextId() { return next_id_++; }
 
   Isolate* isolate_;
   bool initialized_;
   BreakpointHandler* bp_handler_;
   EventHandler* event_handler_;
 
   // ID number generator.
   intptr_t next_id_;
 
   // Current stack trace. Valid while executing breakpoint callback code.
   DebuggerStackTrace* stack_trace_;
 
   RemoteObjectCache* obj_cache_;
 
   SourceBreakpoint* src_breakpoints_;
   CodeBreakpoint* code_breakpoints_;
 
   // Tells debugger what to do when resuming execution after a breakpoint.
   ResumeAction resume_action_;
 
+  // If >= 0, last_bpt_line contains the line number of the last breakpoint
+  // location for which the breakpoint callback function was called.
+  intptr_t last_bpt_line_;
+
   // Do not call back to breakpoint handler if this flag is set.
   // Effectively this means ignoring breakpoints. Set when Dart code may
   // be run as a side effect of getting values of fields.
   bool ignore_breakpoints_;
 
   friend class SourceBreakpoint;
   DISALLOW_COPY_AND_ASSIGN(Debugger);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_DEBUGGER_H_