Get rid of Utils.threadManager

lib/requestNotifier.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 135 matching lines @@
    * running).
    */
   eventsPosted: 0,
 
   /**
    * Starts the initial scan of the window (will recurse into frames).
    * @param {Window} wnd  the window to be scanned
    */
   startScan: function(wnd)
   {
-    let currentThread = Utils.threadManager.currentThread;
+    let currentThread = Services.tm.currentThread;
 
     let doc = wnd.document;
     let walker = doc.createTreeWalker(doc, Ci.nsIDOMNodeFilter.SHOW_ELEMENT, null, false);
 
-    let runnable =
+    let process = function()
     {
-      notifier: null,
+      if (!this.listener)
+        return;
 
-      run: function()
+      let node = walker.currentNode;
+      let data = getEntry(nodeData, node);
+      if (typeof data != "undefined")
+        for (let k in data)
+          this.notifyListener(wnd, node, data[k]);
+
+      if (walker.nextNode())
+        Utils.runAsync(process);
+      else
       {
-        if (!this.notifier.listener)
-          return;
+        // Done with the current window, start the scan for its frames
+        for (let i = 0; i < wnd.frames.length; i++)
+          this.startScan(wnd.frames[i]);
 
-        let node = walker.currentNode;
-        let data = getEntry(nodeData, node);
-        if (typeof data != "undefined")
-          for (let k in data)
-            this.notifier.notifyListener(wnd, node, data[k]);
-
-        if (walker.nextNode())
-          currentThread.dispatch(runnable, Ci.nsIEventTarget.DISPATCH_NORMAL);
-        else
+        this.eventsPosted--;
+        if (!this.eventsPosted)
         {
-          // Done with the current window, start the scan for its frames
-          for (let i = 0; i < wnd.frames.length; i++)
-            this.notifier.startScan(wnd.frames[i]);
-
-          this.notifier.eventsPosted--;
-          if (!this.notifier.eventsPosted)
-          {
-            this.notifier.scanComplete = true;
-            this.notifier.notifyListener(wnd, null, null);
-          }
-
-          this.notifier = null;
+          this.scanComplete = true;
+          this.notifyListener(wnd, null, null);
         }
       }
-    };
-    runnable.notifier = this;
+    }.bind(this);
 
     // Process each node in a separate event on current thread to allow other
     // events to process
     this.eventsPosted++;
-    currentThread.dispatch(runnable, Ci.nsIEventTarget.DISPATCH_NORMAL);
+    Utils.runAsync(process);
   }
 };
 
 RequestNotifier.storeSelection = function(/**Window*/ wnd, /**String*/ selection)
 {
   setEntry(windowSelection, wnd.document, selection);
 };
 RequestNotifier.getSelection = function(/**Window*/ wnd) /**String*/
 {
   if (hasEntry(windowSelection, wnd.document))
@@ skipping 164 matching lines @@
     if (typeof existingData == "undefined")
     {
       existingData = {};
       setEntry(nodeData, node, existingData);
     }
 
     // Add this request to the node data
     existingData[this.type + " " + this.location] = this;
   }
 };