Bug 673467 - Part 1. Don't create an extra SHEntry for dynamically-added iframes. r=bz

2011-07-31 13:17:55 -04:00
parent 32fbe88513
commit 1aee9c28c3
3 changed files with 52 additions and 3 deletions
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -1335,9 +1335,8 @@ nsDocShell::LoadURI(nsIURI * aURI,
                    PRUint32 selfBusy = BUSY_FLAGS_NONE;
                    parentDS->GetBusyFlags(&parentBusy);                    
                    GetBusyFlags(&selfBusy);
-                    if (((parentBusy & BUSY_FLAGS_BUSY) ||
-                         (selfBusy & BUSY_FLAGS_BUSY)) &&
-                        shEntry) {
+                    if (parentBusy & BUSY_FLAGS_BUSY ||
+                        selfBusy & BUSY_FLAGS_BUSY) {
                        loadType = LOAD_NORMAL_REPLACE;
                        shEntry = nsnull; 
                    }