From 51e48520d34452ee11b13f16be076e225c9fcc25 Mon Sep 17 00:00:00 2001
From: Benjamin Stover <bstover@mozilla.com>
Date: Fri, 24 Sep 2010 17:40:45 -0700
Subject: [PATCH] Bug 599501 Browser fights me when I try to zoom r=mfinkle

---
 mobile/chrome/content/bindings/browser.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mobile/chrome/content/bindings/browser.xml b/mobile/chrome/content/bindings/browser.xml
index cb68b93b6781..eb92194dfb04 100644
--- a/mobile/chrome/content/bindings/browser.xml
+++ b/mobile/chrome/content/bindings/browser.xml
@@ -358,7 +358,9 @@
             // (as opposed to one of its iframes).
             if (this.feeds && aMessage.target == this)
               this.feeds = null;
-            this.scale = 1;
+
+            if (aMessage.windowId == this.contentWindowId)
+              this.scale = 1;
          ]]>
         </body>
       </method>