Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 16218: Create webshell for frames with no src to allow js manipulation r= harishd

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@57079 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pollmann%netscape.com 2000-01-07 06:18:48 +00:00
parent 41dc22bdfe
commit f70927eba7
2 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mozilla/layout/generic/nsFrameFrame.cpp
View File

@ -857,22 +857,22 @@ nsHTMLFrameInnerFrame::Reflow(nsIPresContext* aPresContext,
nsAutoString url;
PRBool hasURL = GetURL(content, url);
// if there is a src, create the web shell
// create the web shell
// we do this even if the size is not positive (bug 11762)
if (hasURL) {
if (!mWebShell) {
nsSize maxSize(aReflowState.availableWidth, aReflowState.availableHeight);
rv = CreateWebShell(aPresContext, maxSize);
// we do this even if there is no src (bug 16218)
if (!mWebShell) {
nsSize maxSize(aReflowState.availableWidth, aReflowState.availableHeight);
rv = CreateWebShell(aPresContext, maxSize);
#ifdef INCLUDE_XUL
// The URL can be destructively altered when a content shell is made.
// Refetch it to ensure we have the actual URL to load.
hasURL = GetURL(content, url);
// The URL can be destructively altered when a content shell is made.
// Refetch it to ensure we have the actual URL to load.
hasURL = GetURL(content, url);
#endif // INCLUDE_XUL
}
if (mWebShell) {
mCreatingViewer=PR_TRUE;
}
if (mWebShell) {
mCreatingViewer=PR_TRUE;
if (hasURL) {
// load the document
nsString absURL;
TempMakeAbsURL(content, url, absURL);
@ -891,8 +891,6 @@ nsHTMLFrameInnerFrame::Reflow(nsIPresContext* aPresContext,
}
}
}
} else {
mCreatingViewer = PR_TRUE;
}
NS_RELEASE(content);
}

26
mozilla/layout/html/document/src/nsFrameFrame.cpp
View File

@ -857,22 +857,22 @@ nsHTMLFrameInnerFrame::Reflow(nsIPresContext* aPresContext,
nsAutoString url;
PRBool hasURL = GetURL(content, url);
// if there is a src, create the web shell
// create the web shell
// we do this even if the size is not positive (bug 11762)
if (hasURL) {
if (!mWebShell) {
nsSize maxSize(aReflowState.availableWidth, aReflowState.availableHeight);
rv = CreateWebShell(aPresContext, maxSize);
// we do this even if there is no src (bug 16218)
if (!mWebShell) {
nsSize maxSize(aReflowState.availableWidth, aReflowState.availableHeight);
rv = CreateWebShell(aPresContext, maxSize);
#ifdef INCLUDE_XUL
// The URL can be destructively altered when a content shell is made.
// Refetch it to ensure we have the actual URL to load.
hasURL = GetURL(content, url);
// The URL can be destructively altered when a content shell is made.
// Refetch it to ensure we have the actual URL to load.
hasURL = GetURL(content, url);
#endif // INCLUDE_XUL
}
if (mWebShell) {
mCreatingViewer=PR_TRUE;
}
if (mWebShell) {
mCreatingViewer=PR_TRUE;
if (hasURL) {
// load the document
nsString absURL;
TempMakeAbsURL(content, url, absURL);
@ -891,8 +891,6 @@ nsHTMLFrameInnerFrame::Reflow(nsIPresContext* aPresContext,
}
}
}
} else {
mCreatingViewer = PR_TRUE;
}
NS_RELEASE(content);
}