Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-10 09:19:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing bug 6886. window.outerWidth and window.outerHeight for (i)frames now return the dimensions of the browser window. This is the way 4.x handles these properties.

Browse Source
This commit is contained in:
nisheeth%netscape.com 1999-07-28 07:03:29 +00:00
parent 88a7a3eadb
commit c17e1630e8
1 changed files with 15 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
dom/src/base/nsGlobalWindow.cpp
View File

@ -916,35 +916,18 @@ GlobalWindowImpl::SetInnerHeight(PRInt32 aInnerHeight)
NS_IMETHODIMP
GlobalWindowImpl::GetOuterWidth(PRInt32* aOuterWidth)
{
nsIBrowserWindow *mBrowser;
nsIDOMWindow* parent = nsnull;
nsIBrowserWindow *mBrowser;
GetParent(&parent);
if (parent == this) {
// We are in a top level window. Use browser window's bounds.
if (NS_OK == GetBrowserWindowInterface(mBrowser)) {
nsRect r;
mBrowser->GetWindowBounds(r);
*aOuterWidth = r.width;
NS_RELEASE(mBrowser);
}
else {
*aOuterWidth = 0;
}
if (NS_OK == GetBrowserWindowInterface(mBrowser)) {
nsRect r;
mBrowser->GetWindowBounds(r);
*aOuterWidth = r.width;
NS_RELEASE(mBrowser);
}
else {
// We are in an (i)frame. Use webshell bounds.
if (mWebShell) {
PRInt32 x,y,w,h;
mWebShell->GetBounds(x, y, w, h);
*aOuterWidth = w;
}
else {
*aOuterWidth = 0;
}
*aOuterWidth = 0;
}
NS_RELEASE(parent);
return NS_OK;
}
@ -967,34 +950,16 @@ NS_IMETHODIMP
GlobalWindowImpl::GetOuterHeight(PRInt32* aOuterHeight)
{
nsIBrowserWindow *mBrowser;
nsIDOMWindow* parent = nsnull;
GetParent(&parent);
if (parent == this) {
// We are in a top level window. Use browser window's bounds.
if (NS_OK == GetBrowserWindowInterface(mBrowser)) {
nsRect r;
mBrowser->GetWindowBounds(r);
*aOuterHeight = r.height;
NS_RELEASE(mBrowser);
}
else {
*aOuterHeight = 0;
}
if (NS_OK == GetBrowserWindowInterface(mBrowser)) {
nsRect r;
mBrowser->GetWindowBounds(r);
*aOuterHeight = r.height;
NS_RELEASE(mBrowser);
}
else {
// We are in an (i)frame. Use webshell bounds.
if (mWebShell) {
PRInt32 x,y,w,h;
mWebShell->GetBounds(x, y, w, h);
*aOuterHeight = h;
}
else {
*aOuterHeight = 0;
}
*aOuterHeight = 0;
}
NS_RELEASE(parent);
return NS_OK;
}