corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Bug 386599, Recursive <object> with border hangs Firefox, r=biesi, sr=bz

Browse Source
This commit is contained in:
2007-07-17 00:43:36 -07:00
parent 5e0097738d
commit 03cba7e10b
4 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
content/base/src/nsFrameLoader.cpp
View File

@@ -468,14 +468,14 @@ nsresult
nsFrameLoader::CheckForRecursiveLoad(nsIURI* aURI)
{
mDepthTooGreat = PR_FALSE;
NS_PRECONDITION(mDocShell, "Must have docshell here");
nsresult rv = EnsureDocShell();
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIDocShellTreeItem> treeItem = do_QueryInterface(mDocShell);
NS_ASSERTION(treeItem, "docshell must be a treeitem!");
PRInt32 ourType;
nsresult rv = treeItem->GetItemType(&ourType);
rv = treeItem->GetItemType(&ourType);
if (NS_SUCCEEDED(rv) && ourType != nsIDocShellTreeItem::typeContent) {
// No need to do recursion-protection here XXXbz why not?? Do we really
// trust people not to screw up with non-content docshells?