inspector: assert when clearing breakpoints

If the debugger attempts to set a breakpoint that gets resolved to an
existing breakpoint, then when we go to clear the same breakpoint will
be removed twice. On the second removal the API returns
JsErrorInvalidArgument which is a no-op for this function.

PR-URL: #244
Reviewed-By: Kunal Pathak <Kunal.Pathak@microsoft.com>
Reviewed-By: Sandeep Agarwal <saagarwa@microsoft.com>

Author: kfarnung

deps/chakrashim/src/inspector/v8-debugger.cc

@@ -147,12 +147,11 @@ void V8Debugger::removeBreakpoint(const String16& breakpointId) {
     return;
   }
 
-  JsErrorCode err = JsDiagRemoveBreakpoint(bpId);
-  assert(err == JsNoError || err == JsErrorInvalidArgument);
+  jsrt::Inspector::RemoveBreakpoint(bpId);
 }
 
 void V8Debugger::setBreakpointsActivated(bool activated) {
-  
+  // CHAKRA-TODO - Figure out what to do here
 }
 
 V8Debugger::PauseOnExceptionsState V8Debugger::getPauseOnExceptionsState() {

deps/chakrashim/src/jsrtinspector.cc

@@ -205,6 +205,16 @@ namespace jsrt {
     }
   }
 
+  void Inspector::RemoveBreakpoint(unsigned int breakpointId) {
+    JsErrorCode err = JsDiagRemoveBreakpoint(breakpointId);
+
+    // Ignore invalid argument as the breakpoint may have overlapped with an
+    // existing one.
+    if (err != JsErrorInvalidArgument) {
+      CHAKRA_VERIFY_NOERROR(err);
+    }
+  }
+
   void Inspector::ClearBreakpoints() {
     JsValueRef breakpoints;
     CHAKRA_VERIFY_NOERROR(JsDiagGetBreakpoints(&breakpoints));
@@ -226,7 +236,7 @@ namespace jsrt {
       CHAKRA_VERIFY_NOERROR(jsrt::InspectorHelpers::GetIntProperty(
           breakpoint, "breakpointId", &breakpointId));
 
-      CHAKRA_VERIFY_NOERROR(JsDiagRemoveBreakpoint(breakpointId));
+      RemoveBreakpoint(breakpointId);
     }
   }
 

deps/chakrashim/src/jsrtinspector.h

@@ -37,6 +37,7 @@ class Inspector {
   static void SetChakraDebugObject(JsValueRef chakraDebugObject);
   static void SetDebugEventHandler(JsDiagDebugEventCallback callback,
                                    void* callbackState);
+  static void RemoveBreakpoint(unsigned int breakpointId);
   static void ClearBreakpoints();
 
  private: