[Pkg-mozext-commits] [firebug] 07/16: #7956 Edit variables don't work when execution is stopped

[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 887c7221ddef7c6276a7b39edf501af44194d810
Author: Jan Odvarko <odvarko at gmail.com>
Date:   Thu Nov 5 18:43:22 2015 +0100

    #7956 Edit variables don't work when execution is stopped
---
 extension/content/firebug/debugger/debuggerLib.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/extension/content/firebug/debugger/debuggerLib.js b/extension/content/firebug/debugger/debuggerLib.js
index a11b36a..486e9af 100644
--- a/extension/content/firebug/debugger/debuggerLib.js
+++ b/extension/content/firebug/debugger/debuggerLib.js
@@ -43,6 +43,10 @@ DebuggerLib.unwrapDebuggeeValue = function(obj)
     if (typeof obj !== "object" || obj === null)
         return obj;
 
+    if (typeof obj.unsafeDereference != "function") {
+      return;
+    }
+
     return Wrapper.unwrapObject(obj.unsafeDereference());
 };
 
@@ -147,6 +151,17 @@ DebuggerLib.getObject = function(context, actorId)
         if (!actor && threadActor._pausePool)
             actor = threadActor._pausePool.get(actorId);
 
+        // Check also the youngest frame that contains objects
+        // living in the scope.
+        // We could also iterate all frames through: threadActor.framePool,
+        // but it could have an impact on performance since this method
+        // is called quite often. It would have to be tested carefully.
+        if (!actor && threadActor.youngestFrame &&
+            threadActor.youngestFrame.actor &&
+            threadActor.youngestFrame.actor.frameLifetimePool) {
+          actor = threadActor.youngestFrame.actor.frameLifetimePool.get(actorId);
+        }
+
         if (!actor)
             return null;
 

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