Bug 571812 - Remove setIcon (followup fix) [r=vingtetun]
authorMark Finkle <mfinkle@mozilla.com>
Tue, 15 Jun 2010 14:05:17 -0400
changeset 66286 d20643c6f46343b89dbb8430605e804ba780e346
parent 66285 319f17290cd59cb58b53418396aca17036f31b4b
child 66287 6d64924f7851559b26d3a9d86aef1d968c673b4d
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersvingtetun
bugs571812
Bug 571812 - Remove setIcon (followup fix) [r=vingtetun]
mobile/chrome/content/bindings/browser.xml
--- a/mobile/chrome/content/bindings/browser.xml
+++ b/mobile/chrome/content/bindings/browser.xml
@@ -73,29 +73,25 @@
       <field name="_ios">
          Components.classes["@mozilla.org/network/io-service;1"].getService(Components.interfaces.nsIIOService);
       </field>
 
       <method name="receiveMessage">
         <parameter name="aMessage"/>
         <body><![CDATA[
           switch (aMessage.name) {
-            case "DOMContentLoaded":
-              let data = aMessage.json;
-              if (this.mIconURL == "") {
-                this.mIconURL = this.documentURI.prePath + "/favicon.ico";
-              }
-              break;
-
             case "DOMPopupBlocked":
               this.onPopupBlocked(aMessage);
               break;
 
             case "pageshow":
               this.onPageShow(aMessage);
+
+              if (this.mIconURL == "")
+                this.mIconURL = this.documentURI.prePath + "/favicon.ico";
               break;
 
             case "pagehide":
               this.onPageHide(aMessage);
               break;
 
             case "DOMTitleChanged":
               this._contentTitle = aMessage.json.title;
@@ -368,17 +364,16 @@
           }
           try {
             var securityUI = this.securityUI;
           }
           catch (e) {
           }
 
           messageManager.loadFrameScript("chrome://browser/content/bindings/browser.js", true);
-          messageManager.addMessageListener("DOMContentLoaded", this);
           messageManager.addMessageListener("DOMTitleChanged", this);
           messageManager.addMessageListener("DOMLinkAdded", this);
 
           // Listen for first load for lazy attachment to form fill controller
           messageManager.addMessageListener("pageshow", this);
           messageManager.addMessageListener("pagehide", this);
           messageManager.addMessageListener("DOMPopupBlocked", this);