[Pkg-mozext-commits] [firebug] 26/28: Update tracing (avoid exception)

[David Prévot]

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

taffit pushed a commit to tag firebug-1.10.3
in repository firebug.

commit 43511bfe9e0d7fd73817f6bdd41fdea4cbdc86e6
Author: Jan Odvarko <odvarko at gmail.com>
Date:   Wed Aug 22 14:04:43 2012 +0200

    Update tracing (avoid exception)
---
 extension/content/firebug/chrome/activation.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/extension/content/firebug/chrome/activation.js b/extension/content/firebug/chrome/activation.js
index cbb9eef..39253ad 100644
--- a/extension/content/firebug/chrome/activation.js
+++ b/extension/content/firebug/chrome/activation.js
@@ -85,9 +85,12 @@ Firebug.Activation = Obj.extend(Firebug.Module,
             var hasAnnotation = Annotations.pageHasAnnotation(uri);
 
             if (FBTrace.DBG_ACTIVATION)
-                FBTrace.sysout("shouldCreateContext hasAnnotation "+hasAnnotation +
-                    " for "+uri.spec+" in "+browser.contentWindow.location +
-                    " using activateSameOrigin: "+Firebug.activateSameOrigin);
+            {
+                FBTrace.sysout("shouldCreateContext hasAnnotation " + hasAnnotation +
+                    " for " + uri.spec + " in " +
+                    (browser ? browser.contentWindow.location : "no browser") +
+                    " using activateSameOrigin: " + Firebug.activateSameOrigin);
+            }
 
             // Annotated, so return the value.
             if (hasAnnotation)
@@ -97,9 +100,12 @@ Firebug.Activation = Obj.extend(Firebug.Module,
             {
                 var dst = browser.FirebugLink.dst;
                 var dstURI = this.convertToURIKey(dst.spec, Firebug.activateSameOrigin);
+
                 if (FBTrace.DBG_ACTIVATION)
+                {
                     FBTrace.sysout("shouldCreateContext found FirebugLink pointing to " +
                         dstURI.spec, browser.FirebugLink);
+                }
 
                 if (dstURI && dstURI.equals(uri)) // and it matches us now
                 {
@@ -109,8 +115,10 @@ Firebug.Activation = Obj.extend(Firebug.Module,
                     if (srcURI)
                     {
                         if (FBTrace.DBG_ACTIVATION)
+                        {
                             FBTrace.sysout("shouldCreateContext found FirebugLink pointing from " +
                                 srcURI.spec, browser.FirebugLink);
+                        }
 
                         // and it's on the same domain
                         if (srcURI.schemeIs("file") || (dstURI.host == srcURI.host))

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