From 79160f00dfbd87d5d6eeec4ddac9abea2bd1d65b Mon Sep 17 00:00:00 2001 From: "hyatt%netscape.com" Date: Fri, 2 Jul 1999 05:29:18 +0000 Subject: [PATCH] Making sure the default scrolling behavior for a webshell in XUL is OVERFLOW_HIDDEN always. Scrolling behavior set on the box itself can be used to enable scrolling. --- content/xul/document/src/nsXULDocument.cpp | 12 +----------- rdf/content/src/nsXULDocument.cpp | 12 +----------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/content/xul/document/src/nsXULDocument.cpp b/content/xul/document/src/nsXULDocument.cpp index c0d01d6a2cc..731169318d8 100644 --- a/content/xul/document/src/nsXULDocument.cpp +++ b/content/xul/document/src/nsXULDocument.cpp @@ -2926,7 +2926,6 @@ XULDocumentImpl::SetPopupElement(nsIDOMElement* anElement) return NS_OK; } - NS_IMETHODIMP XULDocumentImpl::GetTooltipElement(nsIDOMElement** anElement) { @@ -3967,16 +3966,7 @@ XULDocumentImpl::StartLayout(void) nsCOMPtr webShell; webShell = do_QueryInterface(container); if (webShell) { - nsCOMPtr styleContext; - if (NS_SUCCEEDED(cx->ResolveStyleContextFor(mRootContent, nsnull, - PR_FALSE, - getter_AddRefs(styleContext)))) { - - const nsStyleDisplay* disp = (const nsStyleDisplay*) - styleContext->GetStyleData(eStyleStruct_Display); - - webShell->SetScrolling(disp->mOverflow); - } + webShell->SetScrolling(NS_STYLE_OVERFLOW_HIDDEN); } } } diff --git a/rdf/content/src/nsXULDocument.cpp b/rdf/content/src/nsXULDocument.cpp index c0d01d6a2cc..731169318d8 100644 --- a/rdf/content/src/nsXULDocument.cpp +++ b/rdf/content/src/nsXULDocument.cpp @@ -2926,7 +2926,6 @@ XULDocumentImpl::SetPopupElement(nsIDOMElement* anElement) return NS_OK; } - NS_IMETHODIMP XULDocumentImpl::GetTooltipElement(nsIDOMElement** anElement) { @@ -3967,16 +3966,7 @@ XULDocumentImpl::StartLayout(void) nsCOMPtr webShell; webShell = do_QueryInterface(container); if (webShell) { - nsCOMPtr styleContext; - if (NS_SUCCEEDED(cx->ResolveStyleContextFor(mRootContent, nsnull, - PR_FALSE, - getter_AddRefs(styleContext)))) { - - const nsStyleDisplay* disp = (const nsStyleDisplay*) - styleContext->GetStyleData(eStyleStruct_Display); - - webShell->SetScrolling(disp->mOverflow); - } + webShell->SetScrolling(NS_STYLE_OVERFLOW_HIDDEN); } } }