From e5357b486450ae2b5e1ea2a707b8643167d5b27a Mon Sep 17 00:00:00 2001 From: "pollmann%netscape.com" Date: Thu, 3 Aug 2000 22:23:48 +0000 Subject: [PATCH] Bug 35986: document==NULL for FRAMEs created without SRC; r=kmcclusk git-svn-id: svn://10.0.0.236/trunk@75528 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsFrameFrame.cpp | 4 ++-- mozilla/layout/html/document/src/nsFrameFrame.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mozilla/layout/generic/nsFrameFrame.cpp b/mozilla/layout/generic/nsFrameFrame.cpp index f8cf05069ad..16053ff7c5a 100644 --- a/mozilla/layout/generic/nsFrameFrame.cpp +++ b/mozilla/layout/generic/nsFrameFrame.cpp @@ -836,8 +836,8 @@ nsHTMLFrameInnerFrame::DoLoadURL(nsIPresContext* aPresContext) nsAutoString url; GetURL(parentContent, url); - if (url.IsEmpty()) - return NS_OK; + if (url.IsEmpty()) // Load about:blank into a frame if not URL is specified (bug 35986) + url = NS_ConvertASCIItoUCS2("about:blank"); // Make an absolute URL nsCOMPtr baseURL; diff --git a/mozilla/layout/html/document/src/nsFrameFrame.cpp b/mozilla/layout/html/document/src/nsFrameFrame.cpp index f8cf05069ad..16053ff7c5a 100644 --- a/mozilla/layout/html/document/src/nsFrameFrame.cpp +++ b/mozilla/layout/html/document/src/nsFrameFrame.cpp @@ -836,8 +836,8 @@ nsHTMLFrameInnerFrame::DoLoadURL(nsIPresContext* aPresContext) nsAutoString url; GetURL(parentContent, url); - if (url.IsEmpty()) - return NS_OK; + if (url.IsEmpty()) // Load about:blank into a frame if not URL is specified (bug 35986) + url = NS_ConvertASCIItoUCS2("about:blank"); // Make an absolute URL nsCOMPtr baseURL;