[Pkg-mozext-commits] [firebug] 06/22: Issue 7496: Cookie breakpoints disappear after reopening Firebug

[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 dfe8c876584530deb6da939a4c0ae8d5794d59a0
Author: Jan Odvarko <odvarko at gmail.com>
Date:   Tue Jun 24 18:09:40 2014 +0200

    Issue 7496: 	Cookie breakpoints disappear after reopening Firebug
---
 extension/content/firebug/bti/inProcess/browser.js |  5 -----
 extension/content/firebug/debugger/debugger.js     | 12 ++++++++++++
 extension/content/firebug/firebug.js               |  2 ++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/extension/content/firebug/bti/inProcess/browser.js b/extension/content/firebug/bti/inProcess/browser.js
index 33179ec..9fb8a93 100644
--- a/extension/content/firebug/bti/inProcess/browser.js
+++ b/extension/content/firebug/bti/inProcess/browser.js
@@ -247,11 +247,6 @@ Browser.prototype.closeContext = function(context, userCommands)
             result = true;
         }
 
-        // Firebug is closing, clean up the persisted content. The persisted state should
-        // not be used after re-activating Firebug (see also issue issue 6901, breakpoint
-        // client objects need to be recreated).
-        delete browser.persistedState;
-
         return result;
     }
 };
diff --git a/extension/content/firebug/debugger/debugger.js b/extension/content/firebug/debugger/debugger.js
index dd913f1..1f912ff 100644
--- a/extension/content/firebug/debugger/debugger.js
+++ b/extension/content/firebug/debugger/debugger.js
@@ -133,6 +133,18 @@ Firebug.Debugger = Obj.extend(ActivableModule,
         persistedState.breakpointClients = context.breakpointClients;
     },
 
+    closeFirebug: function(context)
+    {
+        Trace.sysout("debugger.closeFirebug; context ID: " + context.getId());
+
+        // Do not persist breakpoint client object across Firebug
+        // shutdown/open. The RDP connection is closed on shutdown and
+        // all client objects need to be recreated (they are valid only
+        // across page refreshes).
+        // (see issue 6901 and issue 7496)
+        context.persistedState.breakpointClients = null;
+    },
+
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
     // DebuggerClient
 
diff --git a/extension/content/firebug/firebug.js b/extension/content/firebug/firebug.js
index 6f9a23b..ed4d101 100644
--- a/extension/content/firebug/firebug.js
+++ b/extension/content/firebug/firebug.js
@@ -825,6 +825,8 @@ window.Firebug =
         // Focus the browser window again
         Firebug.currentContext.window.focus();
 
+        Events.dispatch(modules, "closeFirebug", [Firebug.currentContext]);
+
         Firebug.connection.closeContext(Firebug.currentContext, userCommands);
         Firebug.StartButton.resetTooltip();
     },

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