bug 135046, remove p3p performance penalty, r=dp, sr=waterson, a=asa, adt=putterman

extensions/cookie/resources/content/cookieTasksOverlay.xul

@@ -54,7 +54,8 @@
       }
     }
 
-    function TestIconVisibility() {
+    var listener = {
+      handleEvent: function(event) {
         var cookieservice = Components.classes["@mozilla.org/cookieService;1"].getService();
         cookieservice = cookieservice.QueryInterface(Components.interfaces.nsICookieService);
         if (cookieservice.cookieIconIsVisible) {
@@ -64,6 +65,7 @@
           }
         }
       }
+    };
 
     function viewP3PDialog() {
       if (!gObserverService) {
@@ -96,8 +98,8 @@
         observerService.addObserver(cookieIconObserver, "cookieIcon", false);
 
         // determine whether or not cookie icon in this new window should be displayed
-        // we need to delay before displaying icon because it hasn't been created yet
-        setTimeout(TestIconVisibility, 0);
+        // we need to wait until window is created before displaying icon
+        addEventListener("load", listener, false);
       }
     }
   ]]>

xpfe/components/permissions/content/cookieTasksOverlay.xul

@@ -54,7 +54,8 @@
       }
     }
 
-    function TestIconVisibility() {
+    var listener = {
+      handleEvent: function(event) {
         var cookieservice = Components.classes["@mozilla.org/cookieService;1"].getService();
         cookieservice = cookieservice.QueryInterface(Components.interfaces.nsICookieService);
         if (cookieservice.cookieIconIsVisible) {
@@ -64,6 +65,7 @@
           }
         }
       }
+    };
 
     function viewP3PDialog() {
       if (!gObserverService) {
@@ -96,8 +98,8 @@
         observerService.addObserver(cookieIconObserver, "cookieIcon", false);
 
         // determine whether or not cookie icon in this new window should be displayed
-        // we need to delay before displaying icon because it hasn't been created yet
-        setTimeout(TestIconVisibility, 0);
+        // we need to wait until window is created before displaying icon
+        addEventListener("load", listener, false);
       }
     }
   ]]>