Bug 1582193 - Skipping breakpoints should also skip watchpoints r=jlast draft
authorjaril <jarilvalenciano@gmail.com>
Tue, 10 Dec 2019 04:30:01 +0000
changeset 2526051 82e04935463e93e32e42c45b505b061b251dc720
parent 2524186 666b11c33feeefe55eac9412d6ab4e4eecfdcc4a
child 2526052 db2698d188b9959aa23e50161de9215271ca1168
push id462923
push userreviewbot
push dateTue, 10 Dec 2019 04:30:21 +0000
treeherdertry@db2698d188b9 [default view] [failures only]
reviewersjlast
bugs1582193
milestone73.0a1
Bug 1582193 - Skipping breakpoints should also skip watchpoints r=jlast Reviewers: jlast Tags: #secure-revision Bug #: 1582193 Differential Revision: https://phabricator.services.mozilla.com/D56477 Differential Diff: PHID-DIFF-v6wpjmsqzuxpd6lbibuo
devtools/server/actors/object.js
--- a/devtools/server/actors/object.js
+++ b/devtools/server/actors/object.js
@@ -151,34 +151,40 @@ const proto = {
         }),
         get: this.obj.makeDebuggeeValue(() => {
           const frame = this.thread.dbg.getNewestFrame();
 
           if (!this.thread.hasMoved(frame, "getWatchpoint")) {
             return false;
           }
 
-          pauseAndRespond("getWatchpoint");
+          if (!this.thread.skipBreakpoints) {
+            pauseAndRespond("getWatchpoint");
+          }
+
           return desc.value;
         }),
       });
     }
 
     if (watchpointType === "set") {
       this.obj.defineProperty(property, {
         configurable: desc.configurable,
         enumerable: desc.enumerable,
         set: this.obj.makeDebuggeeValue(v => {
           const frame = this.thread.dbg.getNewestFrame();
 
           if (!this.thread.hasMoved(frame, "setWatchpoint")) {
             return;
           }
 
-          pauseAndRespond("setWatchpoint");
+          if (!this.thread.skipBreakpoints) {
+            pauseAndRespond("setWatchpoint");
+          }
+
           desc.value = v;
         }),
         get: this.obj.makeDebuggeeValue(() => {
           return desc.value;
         }),
       });
     }
   },