merge fx-team to mozilla-central

2014-02-07 09:52:32 +01:00
parent de37fbf529 c677744f9e
commit 90b75a472d
90 changed files with 5921 additions and 188 deletions
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -2967,8 +2967,15 @@ nsDocShell::RecomputeCanExecuteScripts()
 nsresult
 nsDocShell::SetDocLoaderParent(nsDocLoader * aParent)
 {
+    bool wasFrame = IsFrame();
+
    nsDocLoader::SetDocLoaderParent(aParent);

+    nsCOMPtr<nsISupportsPriority> priorityGroup = do_QueryInterface(mLoadGroup);
+    if (wasFrame != IsFrame() && priorityGroup) {
+        priorityGroup->AdjustPriority(wasFrame ? -1 : 1);
+    }
+
    // Curse ambiguous nsISupports inheritance!
    nsISupports* parent = GetAsSupports(aParent);