Bug 626873 Navigating sometimes does not reset scale r=mfinkle

mobile/chrome/content/bindings/browser.js

@@ -192,6 +192,9 @@ let DOMEvents =  {
 
       case "pageshow":
       case "pagehide": {
+        if (aEvent.target.defaultView != content)
+          break;
+
         let util = aEvent.target.defaultView.QueryInterface(Ci.nsIInterfaceRequestor)
                                             .getInterface(Ci.nsIDOMWindowUtils);
 

mobile/chrome/content/bindings/browser.xml

@@ -332,8 +332,7 @@
             if (this.feeds && aMessage.target == this)
               this.feeds = null;
 
-            if (aMessage.windowId == this.contentWindowId)
+            this.scale = 1;
-              this.scale = 1;
          ]]>
         </body>
       </method>