[Pkg-mozext-commits] [requestpolicy] 177/280: some cleanup

[David Prévot]

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

taffit pushed a commit to branch master
in repository requestpolicy.

commit d4027b9baac6efdc9d3903c36236b3ab81eafee1
Author: Martin Kimmerle <dev at 256k.de>
Date:   Sun Jan 25 20:43:11 2015 +0100

    some cleanup
---
 src/content/lib/environment.process.js     |  4 ++--
 src/content/ui/frame.dom-content-loaded.js | 23 -----------------------
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/src/content/lib/environment.process.js b/src/content/lib/environment.process.js
index 53fe5ab..f6adfc5 100644
--- a/src/content/lib/environment.process.js
+++ b/src/content/lib/environment.process.js
@@ -175,7 +175,7 @@ let ProcessEnvironment = (function() {
       // Unloading `environment.jsm` has to be the last task.
       // After that task, any global object, such as
       // `Environment` or `Cu` is not available anymore.
-      console.debug("unloading environment.jsm");
+      //console.debug("unloading environment.jsm");
       Cu.unload("chrome://requestpolicy/content/lib/environment.jsm");
     };
 
@@ -202,7 +202,7 @@ let ProcessEnvironment = (function() {
     if (self.envState === ENV_STATES.NOT_STARTED) {
       // The child Process Environment needs to start up when
       // the first framescript in that child is loading.
-      console.debug("[RPC] Going to start up Child Process Environment.");
+      //console.debug("[RPC] Going to start up Child Process Environment.");
       self.startup();
     }
     ProcessEnvironmentBase.prototype.registerInnerEnvironment.apply(self,
diff --git a/src/content/ui/frame.dom-content-loaded.js b/src/content/ui/frame.dom-content-loaded.js
index b37a945..3563cc3 100644
--- a/src/content/ui/frame.dom-content-loaded.js
+++ b/src/content/ui/frame.dom-content-loaded.js
@@ -111,14 +111,6 @@ let ManagerForDOMContentLoaded = (function() {
     // use a timeout like observerBlockedRequests does.
     if (isActiveTopLevelDocument(iframe.ownerDocument)) {
       mm.sendAsyncMessage(C.MM_PREFIX + "notifyDOMFrameContentLoaded");
-      /*
-      // This has an advantage over just relying on the
-      // observeBlockedRequest() call in that this will clear a blocked
-      // content notification if there no longer blocked content. Another way
-      // to solve this would be to observe allowed requests as well as blocked
-      // requests.
-      self._updateBlockedContentState(iframe.ownerDocument);
-      */
     }
   }
 
@@ -301,20 +293,5 @@ let ManagerForDOMContentLoaded = (function() {
   framescriptEnv.elManager.addListener(mm, "DOMFrameContentLoaded",
                                        onDOMFrameContentLoaded, true);
 
-  //mm.addEventListener("DOMContentLoaded", onDOMContentLoaded, true);
-  //
-  //// DOMFrameContentLoaded is same DOMContentLoaded but also fires for
-  //// enclosed frames.
-  //mm.addEventListener("DOMFrameContentLoaded", onDOMFrameContentLoaded, true);
-  //
-  //// clean up on shutdown
-  //framescriptEnv.addShutdownFunction(Environment.LEVELS.INTERFACE, function() {
-  //  Logger.dump('removing listeners for "DOMContentLoaded" and ' +
-  //              '"DOMFrameContentLoaded"');
-  //  mm.removeEventListener("DOMContentLoaded", onDOMContentLoaded, true);
-  //  mm.removeEventListener("DOMFrameContentLoaded", onDOMFrameContentLoaded,
-  //                         true);
-  //});
-
   return self;
 }());

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