[Pkg-mozext-commits] [firebug] 40/59: Issue 7598: Disabled breakpoints in evaled scripts are not really disabled

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository firebug.

commit c11850adadb85084fcd6f2db8838608aca7d6c3e
Author: Florent FAYOLLE <florent.fayolle69 at gmail.com>
Date:   Thu Aug 7 22:06:57 2014 +0200

    Issue 7598: Disabled breakpoints in evaled scripts are not really disabled
---
 extension/content/firebug/debugger/breakpoints/breakpointModule.js | 7 +++++--
 extension/content/firebug/debugger/breakpoints/breakpointStore.js  | 4 ++--
 extension/content/firebug/debugger/script/sourceTool.js            | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/extension/content/firebug/debugger/breakpoints/breakpointModule.js b/extension/content/firebug/debugger/breakpoints/breakpointModule.js
index f7780d9..033762d 100644
--- a/extension/content/firebug/debugger/breakpoints/breakpointModule.js
+++ b/extension/content/firebug/debugger/breakpoints/breakpointModule.js
@@ -215,14 +215,17 @@ var BreakpointModule = Obj.extend(Firebug.Module,
     {
         var type = packet.why.type;
         var tool = context.getTool("debugger");
+        var isDynamic = type == "dynamic-breakpoint";
 
         Trace.sysout("breakpointModule.shouldBreakDebugger;", packet);
 
         // If paused by a breakpoint, evaluate optional condition expression.
-        if (type == "breakpoint")
+        if (type == "breakpoint" || isDynamic)
         {
             var location = packet.frame.where;
-            var bp = BreakpointStore.findBreakpoint(location.url, location.line - 1, -1);
+            var bp = BreakpointStore.findBreakpoint(location.url, location.line - 1, -1, isDynamic);
+
+            Trace.sysout("breakpointModule.shouldBreakDebugger; Testing this breakpoint", bp);
 
             // xxxHonza: hack, breakpoints in dynamic scripts are using different URLs., fix me.
             if (!bp)
diff --git a/extension/content/firebug/debugger/breakpoints/breakpointStore.js b/extension/content/firebug/debugger/breakpoints/breakpointStore.js
index e17af1b..ae6a4a2 100644
--- a/extension/content/firebug/debugger/breakpoints/breakpointStore.js
+++ b/extension/content/firebug/debugger/breakpoints/breakpointStore.js
@@ -379,11 +379,11 @@ var BreakpointStore = Obj.extend(Module,
         });
     },
 
-    findBreakpoint: function(url, lineNo, type)
+    findBreakpoint: function(url, lineNo, type, dynamic)
     {
         type = type || BP_NORMAL;
 
-        var bps = this.getBreakpoints(url);
+        var bps = this.getBreakpoints(url, dynamic);
         if (!bps)
             return null;
 
diff --git a/extension/content/firebug/debugger/script/sourceTool.js b/extension/content/firebug/debugger/script/sourceTool.js
index e79431b..55ffe43 100644
--- a/extension/content/firebug/debugger/script/sourceTool.js
+++ b/extension/content/firebug/debugger/script/sourceTool.js
@@ -566,7 +566,7 @@ BreakpointHitHandler.prototype =
 
         // Send "pause" packet with a new "dynamic-breakpoint" type.
         // The debugging will start as usual within {@link DebuggerTool#paused} method.
-        return threadActor._pauseAndRespond(frame, "dynamic-breakpoint");
+        return threadActor._pauseAndRespond(frame, {type: "dynamic-breakpoint"});
     }
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/firebug.git