Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 15:52:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing bug 180552. Make document.body.client* work even if the body element's overflow is set to hidden. r=caillon@returnzero.com, sr=peterv@netscape.com

Browse Source
This commit is contained in:
jst%netscape.com 2003-01-22 06:25:24 +00:00
parent 0a514a798c
commit 9111ec7a30
2 changed files with 61 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
content/html/content/src/nsGenericHTMLElement.cpp
View File

@ -958,7 +958,8 @@ nsGenericHTMLElement::SetInnerHTML(const nsAString& aInnerHTML)
nsresult
nsGenericHTMLElement::GetScrollInfo(nsIScrollableView **aScrollableView,
float *aP2T, float *aT2P)
float *aP2T, float *aT2P,
nsIFrame **aFrame)
{
*aScrollableView = nsnull;
*aP2T = 0.0f;
@ -980,6 +981,13 @@ nsGenericHTMLElement::GetScrollInfo(nsIScrollableView **aScrollableView,
return NS_OK;
}
// Get the presentation context
nsCOMPtr<nsIPresContext> presContext;
presShell->GetPresContext(getter_AddRefs(presContext));
if (!presContext) {
return NS_OK;
}
// Get the primary frame for this element
nsIFrame *frame = nsnull;
presShell->GetPrimaryFrameFor(this, &frame);
@ -987,11 +995,8 @@ nsGenericHTMLElement::GetScrollInfo(nsIScrollableView **aScrollableView,
return NS_OK;
}
// Get the presentation context
nsCOMPtr<nsIPresContext> presContext;
presShell->GetPresContext(getter_AddRefs(presContext));
if (!presContext) {
return NS_OK;
if (aFrame) {
*aFrame = frame;
}
presContext->GetPixelsToTwips(aP2T);
@ -1168,6 +1173,26 @@ nsGenericHTMLElement::GetScrollWidth(PRInt32* aScrollWidth)
return rv;
}
// static
const nsSize
nsGenericHTMLElement::GetClientAreaSize(nsIFrame *aFrame)
{
nsRect rect;
aFrame->GetRect(rect);
const nsStyleBorder* border = nsnull;
aFrame->GetStyleData(eStyleStruct_Border, (const nsStyleStruct*&)border);
if (border) {
nsMargin border_size;
border->CalcBorderFor(aFrame, border_size);
rect.Deflate(border_size);
}
return nsSize(rect.width, rect.height);
}
nsresult
nsGenericHTMLElement::GetClientHeight(PRInt32* aClientHeight)
{
@ -1175,10 +1200,10 @@ nsGenericHTMLElement::GetClientHeight(PRInt32* aClientHeight)
*aClientHeight = 0;
nsIScrollableView *scrollView = nsnull;
nsresult rv = NS_OK;
float p2t, t2p;
nsIFrame *frame = nsnull;
GetScrollInfo(&scrollView, &p2t, &t2p);
GetScrollInfo(&scrollView, &p2t, &t2p, &frame);
if (scrollView) {
const nsIView *view = nsnull;
@ -1188,9 +1213,16 @@ nsGenericHTMLElement::GetClientHeight(PRInt32* aClientHeight)
view->GetBounds(r);
*aClientHeight = NSTwipsToIntPixels(r.height, t2p);
} else if (mNodeInfo->Equals(nsHTMLAtoms::body) && frame) {
// Special case code to make document.body.clientHeight work even
// if the body element's overflow is hidden.
//
// http://bugzilla.mozilla.org/show_bug.cgi?id=180552
*aClientHeight = NSTwipsToIntPixels(GetClientAreaSize(frame).height, t2p);
}
return rv;
return NS_OK;
}
nsresult
@ -1200,10 +1232,10 @@ nsGenericHTMLElement::GetClientWidth(PRInt32* aClientWidth)
*aClientWidth = 0;
nsIScrollableView *scrollView = nsnull;
nsresult rv = NS_OK;
float p2t, t2p;
nsIFrame *frame = nsnull;
GetScrollInfo(&scrollView, &p2t, &t2p);
GetScrollInfo(&scrollView, &p2t, &t2p, &frame);
if (scrollView) {
const nsIView *view = nsnull;
@ -1213,9 +1245,16 @@ nsGenericHTMLElement::GetClientWidth(PRInt32* aClientWidth)
view->GetBounds(r);
*aClientWidth = NSTwipsToIntPixels(r.width, t2p);
} else if (mNodeInfo->Equals(nsHTMLAtoms::body) && frame) {
// Special case code to make document.body.clientWidth work even
// if the body element's overflow is hidden.
//
// http://bugzilla.mozilla.org/show_bug.cgi?id=180552
*aClientWidth = NSTwipsToIntPixels(GetClientAreaSize(frame).width, t2p);
}
return rv;
return NS_OK;
}
nsresult

11
content/html/content/src/nsGenericHTMLElement.h
View File

@ -69,6 +69,7 @@ class nsIPresState;
class nsIScrollableView;
class nsILayoutHistoryState;
struct nsRect;
struct nsSize;
/**
@ -163,7 +164,15 @@ public:
nsresult GetOffsetRect(nsRect& aRect,
nsIContent** aOffsetParent);
nsresult GetScrollInfo(nsIScrollableView **aScrollableView, float *aP2T,
float *aT2P);
float *aT2P, nsIFrame **aFrame = nsnull);
/**
* Get an element's client info if the element doesn't have a
* scrollable view.
* @param aFrame the frame for which to get the client area size
* @return the size of the frame's client area
*/
static const nsSize GetClientAreaSize(nsIFrame *aFrame);
// Implementation for nsIContent
NS_IMETHOD SetDocument(nsIDocument* aDocument, PRBool aDeep,