Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 05:15:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improving XBL support.

Browse Source
This commit is contained in:
hyatt%netscape.com 2000-03-11 10:38:36 +00:00
parent 6833dbc93d
commit 6ead515970
12 changed files with 212 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
content/html/content/src/nsHTMLInputElement.cpp
View File

@ -202,6 +202,7 @@ public:
// nsIBindableContent
NS_IMETHOD SetBinding(nsIXBLBinding* aBinding);
NS_IMETHOD GetBinding(nsIXBLBinding** aResult);
NS_IMETHOD GetBaseTag(nsIAtom** aResult);
// Helper method
NS_IMETHOD SetPresStateChecked(nsIHTMLContent * aHTMLContent,
@ -757,6 +758,15 @@ nsHTMLInputElement::GetBinding(nsIXBLBinding** aResult)
return NS_OK;
}
NS_IMETHODIMP
nsHTMLInputElement::GetBaseTag(nsIAtom** aResult)
{
if (mBinding)
return mBinding->GetBaseTag(aResult);
else
return NS_OK;
}
NS_IMETHODIMP
nsHTMLInputElement::Select()
{

9
content/html/content/src/nsHTMLTextAreaElement.cpp
View File

@ -133,6 +133,7 @@ public:
// nsIBindableContent
NS_IMETHOD SetBinding(nsIXBLBinding* aBinding);
NS_IMETHOD GetBinding(nsIXBLBinding** aResult);
NS_IMETHOD GetBaseTag(nsIAtom** aResult);
protected:
nsGenericHTMLContainerElement mInner;
@ -334,6 +335,14 @@ nsHTMLTextAreaElement::GetBinding(nsIXBLBinding** aResult)
return NS_OK;
}
NS_IMETHODIMP
nsHTMLTextAreaElement::GetBaseTag(nsIAtom** aResult)
{
if (mBinding)
return mBinding->GetBaseTag(aResult);
else
return NS_OK;
}
NS_IMETHODIMP
nsHTMLTextAreaElement::Select()

8
content/xml/content/src/nsXMLElement.cpp
View File

@ -235,3 +235,11 @@ nsXMLElement::GetBinding(nsIXBLBinding** aResult)
return NS_OK;
}
NS_IMETHODIMP
nsXMLElement::GetBaseTag(nsIAtom** aResult)
{
if (mBinding)
return mBinding->GetBaseTag(aResult);
else
return NS_OK;
}

1
content/xml/content/src/nsXMLElement.h
View File

@ -203,6 +203,7 @@ public:
// nsIBindableContent
NS_IMETHOD SetBinding(nsIXBLBinding* aBinding);
NS_IMETHOD GetBinding(nsIXBLBinding** aResult);
NS_IMETHOD GetBaseTag(nsIAtom** aResult);
// nsIDOMEventReceiver
NS_IMPL_IDOMEVENTRECEIVER_USING_GENERIC(mInner)

89
layout/base/nsCSSFrameConstructor.cpp
View File

@ -173,6 +173,9 @@ NS_NewTitleFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame );
nsresult
NS_NewBoxFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame, PRBool aIsRoot);
nsresult
NS_NewXULButtonFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame);
nsresult
NS_NewSliderFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame );
@ -4018,7 +4021,7 @@ nsCSSFrameConstructor::CreateAnonymousTreeCellFrames(nsIPresShell* aPresS
#ifdef INCLUDE_XUL
nsresult
nsCSSFrameConstructor::ConstructXULFrame(nsIPresShell* aPresShell,
nsCSSFrameConstructor::ConstructXULFrame(nsIPresShell* aPresShell,
nsIPresContext* aPresContext,
nsFrameConstructorState& aState,
nsIContent* aContent,
@ -4026,6 +4029,7 @@ nsCSSFrameConstructor::ConstructXULFrame(nsIPresShell* aPresShell,
nsIAtom* aTag,
nsIStyleContext* aStyleContext,
nsFrameItems& aFrameItems,
PRBool aXBLBaseTag,
PRBool& aHaltProcessing)
{
PRBool primaryFrameSet = PR_FALSE;
@ -4051,10 +4055,48 @@ nsCSSFrameConstructor::ConstructXULFrame(nsIPresShell* aPresShell,
if (aTag == nsnull)
return NS_OK;
PRInt32 nameSpaceID;
if (NS_SUCCEEDED(aContent->GetNameSpaceID(nameSpaceID)) &&
nameSpaceID == nsXULAtoms::nameSpaceID) {
// The following code allows the user to specify the base tag
// of a XUL object using XBL. XUL objects (like boxes, menus, etc.)
// can then be extended arbitrarily.
if (!aXBLBaseTag) {
const nsStyleUserInterface* ui= (const nsStyleUserInterface*)
aStyleContext->GetStyleData(eStyleStruct_UserInterface);
// Ensure that our XBL bindings are installed.
if (ui->mBehavior != "") {
// Get the XBL loader.
nsresult rv;
NS_WITH_SERVICE(nsIXBLService, xblService, "component://netscape/xbl", &rv);
if (!xblService)
return rv;
// Load the bindings.
xblService->LoadBindings(aContent, ui->mBehavior);
nsCOMPtr<nsIAtom> baseTag;
xblService->GetBaseTag(aContent, getter_AddRefs(baseTag));
if (baseTag) {
// Construct the frame using the XBL base tag.
return ConstructXULFrame( aPresShell,
aPresContext,
aState,
aContent,
aParentFrame,
baseTag,
aStyleContext,
aFrameItems,
PR_TRUE,
aHaltProcessing );
}
}
}
// See if the element is absolutely positioned
const nsStylePosition* position = (const nsStylePosition*)
aStyleContext->GetStyleData(eStyleStruct_Position);
@ -4090,6 +4132,32 @@ nsCSSFrameConstructor::ConstructXULFrame(nsIPresShell* aPresShell,
}
} // End of BOX CONSTRUCTION logic
// BUTTON CONSTRUCTION
else if (aTag == nsXULAtoms::button) {
processChildren = PR_TRUE;
isReplaced = PR_TRUE;
rv = NS_NewXULButtonFrame(aPresShell, &newFrame);
const nsStyleDisplay* display = (const nsStyleDisplay*)
aStyleContext->GetStyleData(eStyleStruct_Display);
// Boxes can scroll.
if (IsScrollable(aPresContext, display)) {
// set the top to be the newly created scrollframe
BuildScrollFrame(aPresShell, aPresContext, aState, aContent, aStyleContext, newFrame, aParentFrame,
topFrame, aStyleContext);
// we have a scrollframe so the parent becomes the scroll frame.
newFrame->GetParent(&aParentFrame);
primaryFrameSet = PR_TRUE;
frameHasBeenInitialized = PR_TRUE;
}
} // End of BUTTON CONSTRUCTION logic
// TITLED BUTTON CONSTRUCTION
else if (aTag == nsXULAtoms::titledbutton ||
@ -4415,14 +4483,6 @@ nsCSSFrameConstructor::ConstructXULFrame(nsIPresShell* aPresShell,
}
// End of SCROLLBUTTON CONSTRUCTION logic
// THUMB CONSTRUCTION
else if (aTag == nsXULAtoms::thumb) {
processChildren = PR_TRUE;
isReplaced = PR_TRUE;
rv = NS_NewThumbFrame(aPresShell, &newFrame);
}
// End of THUMB CONSTRUCTION logic
// SPLITTER CONSTRUCTION
else if (aTag == nsXULAtoms::splitter) {
processChildren = PR_TRUE;
@ -4482,7 +4542,12 @@ nsCSSFrameConstructor::ConstructXULFrame(nsIPresShell* aPresShell,
// if there are any anonymous children create frames for them
CreateAnonymousFrames(aPresShell, aPresContext, aTag, aState, aContent, newFrame,
nsCOMPtr<nsIAtom> tag(aTag);
if (aXBLBaseTag) {
aContent->GetTag(*getter_AddRefs(tag));
}
CreateAnonymousFrames(aPresShell, aPresContext, tag, aState, aContent, newFrame,
childItems);
// Set the frame's initial child list
@ -5566,7 +5631,7 @@ nsCSSFrameConstructor::ConstructFrame(nsIPresShell* aPresShell,
(lastChild == aFrameItems.lastChild))) {
PRBool haltProcessing = PR_FALSE;
rv = ConstructXULFrame(aPresShell, aPresContext, aState, aContent, aParentFrame,
tag, styleContext, aFrameItems, haltProcessing);
tag, styleContext, aFrameItems, PR_FALSE, haltProcessing);
if (haltProcessing) {
return rv;
}

1
layout/base/nsCSSFrameConstructor.h
View File

@ -562,6 +562,7 @@ protected:
nsIAtom* aTag,
nsIStyleContext* aStyleContext,
nsFrameItems& aFrameItems,
PRBool aXBLBaseTag,
PRBool& aHaltProcessing);
#endif

10
layout/html/content/src/nsHTMLInputElement.cpp
View File

@ -202,6 +202,7 @@ public:
// nsIBindableContent
NS_IMETHOD SetBinding(nsIXBLBinding* aBinding);
NS_IMETHOD GetBinding(nsIXBLBinding** aResult);
NS_IMETHOD GetBaseTag(nsIAtom** aResult);
// Helper method
NS_IMETHOD SetPresStateChecked(nsIHTMLContent * aHTMLContent,
@ -757,6 +758,15 @@ nsHTMLInputElement::GetBinding(nsIXBLBinding** aResult)
return NS_OK;
}
NS_IMETHODIMP
nsHTMLInputElement::GetBaseTag(nsIAtom** aResult)
{
if (mBinding)
return mBinding->GetBaseTag(aResult);
else
return NS_OK;
}
NS_IMETHODIMP
nsHTMLInputElement::Select()
{

9
layout/html/content/src/nsHTMLTextAreaElement.cpp
View File

@ -133,6 +133,7 @@ public:
// nsIBindableContent
NS_IMETHOD SetBinding(nsIXBLBinding* aBinding);
NS_IMETHOD GetBinding(nsIXBLBinding** aResult);
NS_IMETHOD GetBaseTag(nsIAtom** aResult);
protected:
nsGenericHTMLContainerElement mInner;
@ -334,6 +335,14 @@ nsHTMLTextAreaElement::GetBinding(nsIXBLBinding** aResult)
return NS_OK;
}
NS_IMETHODIMP
nsHTMLTextAreaElement::GetBaseTag(nsIAtom** aResult)
{
if (mBinding)
return mBinding->GetBaseTag(aResult);
else
return NS_OK;
}
NS_IMETHODIMP
nsHTMLTextAreaElement::Select()

89
layout/html/style/src/nsCSSFrameConstructor.cpp
View File

@ -173,6 +173,9 @@ NS_NewTitleFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame );
nsresult
NS_NewBoxFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame, PRBool aIsRoot);
nsresult
NS_NewXULButtonFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame);
nsresult
NS_NewSliderFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame );
@ -4018,7 +4021,7 @@ nsCSSFrameConstructor::CreateAnonymousTreeCellFrames(nsIPresShell* aPresS
#ifdef INCLUDE_XUL
nsresult
nsCSSFrameConstructor::ConstructXULFrame(nsIPresShell* aPresShell,
nsCSSFrameConstructor::ConstructXULFrame(nsIPresShell* aPresShell,
nsIPresContext* aPresContext,
nsFrameConstructorState& aState,
nsIContent* aContent,
@ -4026,6 +4029,7 @@ nsCSSFrameConstructor::ConstructXULFrame(nsIPresShell* aPresShell,
nsIAtom* aTag,
nsIStyleContext* aStyleContext,
nsFrameItems& aFrameItems,
PRBool aXBLBaseTag,
PRBool& aHaltProcessing)
{
PRBool primaryFrameSet = PR_FALSE;
@ -4051,10 +4055,48 @@ nsCSSFrameConstructor::ConstructXULFrame(nsIPresShell* aPresShell,
if (aTag == nsnull)
return NS_OK;
PRInt32 nameSpaceID;
if (NS_SUCCEEDED(aContent->GetNameSpaceID(nameSpaceID)) &&
nameSpaceID == nsXULAtoms::nameSpaceID) {
// The following code allows the user to specify the base tag
// of a XUL object using XBL. XUL objects (like boxes, menus, etc.)
// can then be extended arbitrarily.
if (!aXBLBaseTag) {
const nsStyleUserInterface* ui= (const nsStyleUserInterface*)
aStyleContext->GetStyleData(eStyleStruct_UserInterface);
// Ensure that our XBL bindings are installed.
if (ui->mBehavior != "") {
// Get the XBL loader.
nsresult rv;
NS_WITH_SERVICE(nsIXBLService, xblService, "component://netscape/xbl", &rv);
if (!xblService)
return rv;
// Load the bindings.
xblService->LoadBindings(aContent, ui->mBehavior);
nsCOMPtr<nsIAtom> baseTag;
xblService->GetBaseTag(aContent, getter_AddRefs(baseTag));
if (baseTag) {
// Construct the frame using the XBL base tag.
return ConstructXULFrame( aPresShell,
aPresContext,
aState,
aContent,
aParentFrame,
baseTag,
aStyleContext,
aFrameItems,
PR_TRUE,
aHaltProcessing );
}
}
}
// See if the element is absolutely positioned
const nsStylePosition* position = (const nsStylePosition*)
aStyleContext->GetStyleData(eStyleStruct_Position);
@ -4090,6 +4132,32 @@ nsCSSFrameConstructor::ConstructXULFrame(nsIPresShell* aPresShell,
}
} // End of BOX CONSTRUCTION logic
// BUTTON CONSTRUCTION
else if (aTag == nsXULAtoms::button) {
processChildren = PR_TRUE;
isReplaced = PR_TRUE;
rv = NS_NewXULButtonFrame(aPresShell, &newFrame);
const nsStyleDisplay* display = (const nsStyleDisplay*)
aStyleContext->GetStyleData(eStyleStruct_Display);
// Boxes can scroll.
if (IsScrollable(aPresContext, display)) {
// set the top to be the newly created scrollframe
BuildScrollFrame(aPresShell, aPresContext, aState, aContent, aStyleContext, newFrame, aParentFrame,
topFrame, aStyleContext);
// we have a scrollframe so the parent becomes the scroll frame.
newFrame->GetParent(&aParentFrame);
primaryFrameSet = PR_TRUE;
frameHasBeenInitialized = PR_TRUE;
}
} // End of BUTTON CONSTRUCTION logic
// TITLED BUTTON CONSTRUCTION
else if (aTag == nsXULAtoms::titledbutton ||
@ -4415,14 +4483,6 @@ nsCSSFrameConstructor::ConstructXULFrame(nsIPresShell* aPresShell,
}
// End of SCROLLBUTTON CONSTRUCTION logic
// THUMB CONSTRUCTION
else if (aTag == nsXULAtoms::thumb) {
processChildren = PR_TRUE;
isReplaced = PR_TRUE;
rv = NS_NewThumbFrame(aPresShell, &newFrame);
}
// End of THUMB CONSTRUCTION logic
// SPLITTER CONSTRUCTION
else if (aTag == nsXULAtoms::splitter) {
processChildren = PR_TRUE;
@ -4482,7 +4542,12 @@ nsCSSFrameConstructor::ConstructXULFrame(nsIPresShell* aPresShell,
// if there are any anonymous children create frames for them
CreateAnonymousFrames(aPresShell, aPresContext, aTag, aState, aContent, newFrame,
nsCOMPtr<nsIAtom> tag(aTag);
if (aXBLBaseTag) {
aContent->GetTag(*getter_AddRefs(tag));
}
CreateAnonymousFrames(aPresShell, aPresContext, tag, aState, aContent, newFrame,
childItems);
// Set the frame's initial child list
@ -5566,7 +5631,7 @@ nsCSSFrameConstructor::ConstructFrame(nsIPresShell* aPresShell,
(lastChild == aFrameItems.lastChild))) {
PRBool haltProcessing = PR_FALSE;
rv = ConstructXULFrame(aPresShell, aPresContext, aState, aContent, aParentFrame,
tag, styleContext, aFrameItems, haltProcessing);
tag, styleContext, aFrameItems, PR_FALSE, haltProcessing);
if (haltProcessing) {
return rv;
}

1
layout/html/style/src/nsCSSFrameConstructor.h
View File

@ -562,6 +562,7 @@ protected:
nsIAtom* aTag,
nsIStyleContext* aStyleContext,
nsFrameItems& aFrameItems,
PRBool aXBLBaseTag,
PRBool& aHaltProcessing);
#endif

8
layout/xml/content/src/nsXMLElement.cpp
View File

@ -235,3 +235,11 @@ nsXMLElement::GetBinding(nsIXBLBinding** aResult)
return NS_OK;
}
NS_IMETHODIMP
nsXMLElement::GetBaseTag(nsIAtom** aResult)
{
if (mBinding)
return mBinding->GetBaseTag(aResult);
else
return NS_OK;
}

1
layout/xml/content/src/nsXMLElement.h
View File

@ -203,6 +203,7 @@ public:
// nsIBindableContent
NS_IMETHOD SetBinding(nsIXBLBinding* aBinding);
NS_IMETHOD GetBinding(nsIXBLBinding** aResult);
NS_IMETHOD GetBaseTag(nsIAtom** aResult);
// nsIDOMEventReceiver
NS_IMPL_IDOMEVENTRECEIVER_USING_GENERIC(mInner)