Bug 697180 - favicon replaced by default one [r=mfinkle]

embedding/android/GeckoApp.java

@@ -538,12 +538,22 @@ abstract public class GeckoApp
 
     void handleLocationChange(final int tabId, final String uri) {
         Tab tab = Tabs.getInstance().getTab(tabId);
-        if (tab != null)
-            tab.updateURL(uri);
+        if (tab == null)
+            return;
+        
+        tab.updateURL(uri);
 
         if (!Tabs.getInstance().isSelectedTab(tab))
             return;
 
+        String oldBaseURI = tab.getURL();
+        oldBaseURI = oldBaseURI.substring(0, oldBaseURI.indexOf('#'));
+
+        String baseURI = uri.substring(0, uri.indexOf('#'));
+        
+        if (baseURI.equals(oldBaseURI))
+            return;
+
         mMainHandler.post(new Runnable() { 
             public void run() {
                 mBrowserToolbar.setTitle(uri);

mobile/chrome/content/browser.js

@@ -586,7 +586,11 @@ Tab.prototype = {
   },
 
   onLocationChange: function(aWebProgress, aRequest, aLocationURI) {
-    let browser = BrowserApp.getBrowserForWindow(aWebProgress.DOMWindow);
+    let contentWin = aWebProgress.DOMWindow;
+    if (contentWin != contentWin.top)
+        return;
+
+    let browser = BrowserApp.getBrowserForWindow(contentWin);
     let uri = browser.currentURI.spec;
 
     let message = {