mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fixed it so scrollable BLOCK elements can be fixed positioned

This commit is contained in:
troy%netscape.com 1999-02-01 18:09:57 +00:00
Родитель f551aeddd7
Коммит 0f2e27b0d9
3 изменённых файлов: 63 добавлений и 36 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

33
content/html/style/src/nsHTMLStyleSheet.cpp
Просмотреть файл

@ -638,7 +638,8 @@ protected:
nsAbsoluteItems& aAbsoluteItems, nsAbsoluteItems& aAbsoluteItems,
nsIFrame*& aNewFrame, nsIFrame*& aNewFrame,
nsAbsoluteItems& aFixedItems, nsAbsoluteItems& aFixedItems,
PRBool isAbsolutelyPositioned, PRBool aIsAbsolutelyPositioned,
PRBool aIsFixedPositioned,
PRBool aCreateBlock); PRBool aCreateBlock);
protected: protected:
PRUint32 mInHeap : 1; PRUint32 mInHeap : 1;
@ -3107,12 +3108,18 @@ HTMLStyleSheetImpl::InitializeScrollFrame(nsIFrame* scrollFrame,
nsAbsoluteItems& aAbsoluteItems, nsAbsoluteItems& aAbsoluteItems,
nsIFrame*& aNewFrame, nsIFrame*& aNewFrame,
nsAbsoluteItems& aFixedItems, nsAbsoluteItems& aFixedItems,
PRBool isAbsolutelyPositioned, PRBool aIsAbsolutelyPositioned,
PRBool aIsFixedPositioned,
PRBool aCreateBlock) PRBool aCreateBlock)
{ {
// Initialize it // Initialize it
nsIFrame* geometricParent = isAbsolutelyPositioned ? aAbsoluteItems.containingBlock : nsIFrame* geometricParent = aParentFrame;
aParentFrame;
if (aIsAbsolutelyPositioned) {
geometricParent = aAbsoluteItems.containingBlock;
} else if (aIsFixedPositioned) {
geometricParent = aFixedItems.containingBlock;
}
scrollFrame->Init(*aPresContext, aContent, geometricParent, aStyleContext); scrollFrame->Init(*aPresContext, aContent, geometricParent, aStyleContext);
// The scroll frame gets the original style context, and the scrolled // The scroll frame gets the original style context, and the scrolled
@ -3132,11 +3139,11 @@ HTMLStyleSheetImpl::InitializeScrollFrame(nsIFrame* scrollFrame,
NS_RELEASE(scrolledPseudoStyle); NS_RELEASE(scrolledPseudoStyle);
// Process children // Process children
if (isAbsolutelyPositioned) { if (aIsAbsolutelyPositioned | aIsFixedPositioned) {
// The area frame becomes a container for child frames that are // The area frame becomes a container for child frames that are
// absolutely positioned // absolutely positioned
nsAbsoluteItems absoluteItems(scrolledFrame); nsAbsoluteItems absoluteItems(scrolledFrame);
nsFrameItems childItems; nsFrameItems childItems;
ProcessChildren(aPresContext, aContent, scrolledFrame, absoluteItems, ProcessChildren(aPresContext, aContent, scrolledFrame, absoluteItems,
childItems, aFixedItems); childItems, aFixedItems);
@ -3197,10 +3204,12 @@ HTMLStyleSheetImpl::ConstructFrameByDisplayType(nsIPresContext* aPresConte
if ((isBlock && (aDisplay->mDisplay != NS_STYLE_DISPLAY_TABLE)) && if ((isBlock && (aDisplay->mDisplay != NS_STYLE_DISPLAY_TABLE)) &&
IsScrollable(aPresContext, aDisplay)) { IsScrollable(aPresContext, aDisplay)) {
// XXX This needs to handle fixed position as well... // See if it's absolute positioned or fixed positioned
if (NS_STYLE_POSITION_ABSOLUTE == position->mPosition) {
// See if it's absolutely positioned isAbsolutelyPositioned = PR_TRUE;
isAbsolutelyPositioned = NS_STYLE_POSITION_ABSOLUTE == position->mPosition; } else if (NS_STYLE_POSITION_FIXED == position->mPosition) {
isFixedPositioned = PR_TRUE;
}
// Create a scroll frame // Create a scroll frame
nsIFrame* scrollFrame; nsIFrame* scrollFrame;
@ -3209,7 +3218,7 @@ HTMLStyleSheetImpl::ConstructFrameByDisplayType(nsIPresContext* aPresConte
// Initialize it // Initialize it
InitializeScrollFrame(scrollFrame, aPresContext, aContent, aParentFrame, aStyleContext, InitializeScrollFrame(scrollFrame, aPresContext, aContent, aParentFrame, aStyleContext,
aAbsoluteItems, newFrame, aFixedItems, aAbsoluteItems, newFrame, aFixedItems,
isAbsolutelyPositioned, PR_FALSE); isAbsolutelyPositioned, isFixedPositioned, PR_FALSE);
#if 0 // XXX The following "ifdef" could has been moved to the method "InitializeScrollFrame" #if 0 // XXX The following "ifdef" could has been moved to the method "InitializeScrollFrame"
nsIFrame* geometricParent = isAbsolutelyPositioned ? aAbsoluteItems.containingBlock : nsIFrame* geometricParent = isAbsolutelyPositioned ? aAbsoluteItems.containingBlock :
@ -3260,7 +3269,7 @@ HTMLStyleSheetImpl::ConstructFrameByDisplayType(nsIPresContext* aPresConte
aNewFrame = scrollFrame; aNewFrame = scrollFrame;
#endif #endif
// See if the frame is absolutely positioned // See if the frame is absolute or fixed positioned
} else if (position->IsAbsolutelyPositioned() && } else if (position->IsAbsolutelyPositioned() &&
((NS_STYLE_DISPLAY_BLOCK == aDisplay->mDisplay) || ((NS_STYLE_DISPLAY_BLOCK == aDisplay->mDisplay) ||
(NS_STYLE_DISPLAY_INLINE == aDisplay->mDisplay) || (NS_STYLE_DISPLAY_INLINE == aDisplay->mDisplay) ||

33
layout/html/style/src/nsHTMLStyleSheet.cpp
Просмотреть файл

@ -638,7 +638,8 @@ protected:
nsAbsoluteItems& aAbsoluteItems, nsAbsoluteItems& aAbsoluteItems,
nsIFrame*& aNewFrame, nsIFrame*& aNewFrame,
nsAbsoluteItems& aFixedItems, nsAbsoluteItems& aFixedItems,
PRBool isAbsolutelyPositioned, PRBool aIsAbsolutelyPositioned,
PRBool aIsFixedPositioned,
PRBool aCreateBlock); PRBool aCreateBlock);
protected: protected:
PRUint32 mInHeap : 1; PRUint32 mInHeap : 1;
@ -3107,12 +3108,18 @@ HTMLStyleSheetImpl::InitializeScrollFrame(nsIFrame* scrollFrame,
nsAbsoluteItems& aAbsoluteItems, nsAbsoluteItems& aAbsoluteItems,
nsIFrame*& aNewFrame, nsIFrame*& aNewFrame,
nsAbsoluteItems& aFixedItems, nsAbsoluteItems& aFixedItems,
PRBool isAbsolutelyPositioned, PRBool aIsAbsolutelyPositioned,
PRBool aIsFixedPositioned,
PRBool aCreateBlock) PRBool aCreateBlock)
{ {
// Initialize it // Initialize it
nsIFrame* geometricParent = isAbsolutelyPositioned ? aAbsoluteItems.containingBlock : nsIFrame* geometricParent = aParentFrame;
aParentFrame;
if (aIsAbsolutelyPositioned) {
geometricParent = aAbsoluteItems.containingBlock;
} else if (aIsFixedPositioned) {
geometricParent = aFixedItems.containingBlock;
}
scrollFrame->Init(*aPresContext, aContent, geometricParent, aStyleContext); scrollFrame->Init(*aPresContext, aContent, geometricParent, aStyleContext);
// The scroll frame gets the original style context, and the scrolled // The scroll frame gets the original style context, and the scrolled
@ -3132,11 +3139,11 @@ HTMLStyleSheetImpl::InitializeScrollFrame(nsIFrame* scrollFrame,
NS_RELEASE(scrolledPseudoStyle); NS_RELEASE(scrolledPseudoStyle);
// Process children // Process children
if (isAbsolutelyPositioned) { if (aIsAbsolutelyPositioned | aIsFixedPositioned) {
// The area frame becomes a container for child frames that are // The area frame becomes a container for child frames that are
// absolutely positioned // absolutely positioned
nsAbsoluteItems absoluteItems(scrolledFrame); nsAbsoluteItems absoluteItems(scrolledFrame);
nsFrameItems childItems; nsFrameItems childItems;
ProcessChildren(aPresContext, aContent, scrolledFrame, absoluteItems, ProcessChildren(aPresContext, aContent, scrolledFrame, absoluteItems,
childItems, aFixedItems); childItems, aFixedItems);
@ -3197,10 +3204,12 @@ HTMLStyleSheetImpl::ConstructFrameByDisplayType(nsIPresContext* aPresConte
if ((isBlock && (aDisplay->mDisplay != NS_STYLE_DISPLAY_TABLE)) && if ((isBlock && (aDisplay->mDisplay != NS_STYLE_DISPLAY_TABLE)) &&
IsScrollable(aPresContext, aDisplay)) { IsScrollable(aPresContext, aDisplay)) {
// XXX This needs to handle fixed position as well... // See if it's absolute positioned or fixed positioned
if (NS_STYLE_POSITION_ABSOLUTE == position->mPosition) {
// See if it's absolutely positioned isAbsolutelyPositioned = PR_TRUE;
isAbsolutelyPositioned = NS_STYLE_POSITION_ABSOLUTE == position->mPosition; } else if (NS_STYLE_POSITION_FIXED == position->mPosition) {
isFixedPositioned = PR_TRUE;
}
// Create a scroll frame // Create a scroll frame
nsIFrame* scrollFrame; nsIFrame* scrollFrame;
@ -3209,7 +3218,7 @@ HTMLStyleSheetImpl::ConstructFrameByDisplayType(nsIPresContext* aPresConte
// Initialize it // Initialize it
InitializeScrollFrame(scrollFrame, aPresContext, aContent, aParentFrame, aStyleContext, InitializeScrollFrame(scrollFrame, aPresContext, aContent, aParentFrame, aStyleContext,
aAbsoluteItems, newFrame, aFixedItems, aAbsoluteItems, newFrame, aFixedItems,
isAbsolutelyPositioned, PR_FALSE); isAbsolutelyPositioned, isFixedPositioned, PR_FALSE);
#if 0 // XXX The following "ifdef" could has been moved to the method "InitializeScrollFrame" #if 0 // XXX The following "ifdef" could has been moved to the method "InitializeScrollFrame"
nsIFrame* geometricParent = isAbsolutelyPositioned ? aAbsoluteItems.containingBlock : nsIFrame* geometricParent = isAbsolutelyPositioned ? aAbsoluteItems.containingBlock :
@ -3260,7 +3269,7 @@ HTMLStyleSheetImpl::ConstructFrameByDisplayType(nsIPresContext* aPresConte
aNewFrame = scrollFrame; aNewFrame = scrollFrame;
#endif #endif
// See if the frame is absolutely positioned // See if the frame is absolute or fixed positioned
} else if (position->IsAbsolutelyPositioned() && } else if (position->IsAbsolutelyPositioned() &&
((NS_STYLE_DISPLAY_BLOCK == aDisplay->mDisplay) || ((NS_STYLE_DISPLAY_BLOCK == aDisplay->mDisplay) ||
(NS_STYLE_DISPLAY_INLINE == aDisplay->mDisplay) || (NS_STYLE_DISPLAY_INLINE == aDisplay->mDisplay) ||

33
layout/style/nsHTMLStyleSheet.cpp
Просмотреть файл

@ -638,7 +638,8 @@ protected:
nsAbsoluteItems& aAbsoluteItems, nsAbsoluteItems& aAbsoluteItems,
nsIFrame*& aNewFrame, nsIFrame*& aNewFrame,
nsAbsoluteItems& aFixedItems, nsAbsoluteItems& aFixedItems,
PRBool isAbsolutelyPositioned, PRBool aIsAbsolutelyPositioned,
PRBool aIsFixedPositioned,
PRBool aCreateBlock); PRBool aCreateBlock);
protected: protected:
PRUint32 mInHeap : 1; PRUint32 mInHeap : 1;
@ -3107,12 +3108,18 @@ HTMLStyleSheetImpl::InitializeScrollFrame(nsIFrame* scrollFrame,
nsAbsoluteItems& aAbsoluteItems, nsAbsoluteItems& aAbsoluteItems,
nsIFrame*& aNewFrame, nsIFrame*& aNewFrame,
nsAbsoluteItems& aFixedItems, nsAbsoluteItems& aFixedItems,
PRBool isAbsolutelyPositioned, PRBool aIsAbsolutelyPositioned,
PRBool aIsFixedPositioned,
PRBool aCreateBlock) PRBool aCreateBlock)
{ {
// Initialize it // Initialize it
nsIFrame* geometricParent = isAbsolutelyPositioned ? aAbsoluteItems.containingBlock : nsIFrame* geometricParent = aParentFrame;
aParentFrame;
if (aIsAbsolutelyPositioned) {
geometricParent = aAbsoluteItems.containingBlock;
} else if (aIsFixedPositioned) {
geometricParent = aFixedItems.containingBlock;
}
scrollFrame->Init(*aPresContext, aContent, geometricParent, aStyleContext); scrollFrame->Init(*aPresContext, aContent, geometricParent, aStyleContext);
// The scroll frame gets the original style context, and the scrolled // The scroll frame gets the original style context, and the scrolled
@ -3132,11 +3139,11 @@ HTMLStyleSheetImpl::InitializeScrollFrame(nsIFrame* scrollFrame,
NS_RELEASE(scrolledPseudoStyle); NS_RELEASE(scrolledPseudoStyle);
// Process children // Process children
if (isAbsolutelyPositioned) { if (aIsAbsolutelyPositioned | aIsFixedPositioned) {
// The area frame becomes a container for child frames that are // The area frame becomes a container for child frames that are
// absolutely positioned // absolutely positioned
nsAbsoluteItems absoluteItems(scrolledFrame); nsAbsoluteItems absoluteItems(scrolledFrame);
nsFrameItems childItems; nsFrameItems childItems;
ProcessChildren(aPresContext, aContent, scrolledFrame, absoluteItems, ProcessChildren(aPresContext, aContent, scrolledFrame, absoluteItems,
childItems, aFixedItems); childItems, aFixedItems);
@ -3197,10 +3204,12 @@ HTMLStyleSheetImpl::ConstructFrameByDisplayType(nsIPresContext* aPresConte
if ((isBlock && (aDisplay->mDisplay != NS_STYLE_DISPLAY_TABLE)) && if ((isBlock && (aDisplay->mDisplay != NS_STYLE_DISPLAY_TABLE)) &&
IsScrollable(aPresContext, aDisplay)) { IsScrollable(aPresContext, aDisplay)) {
// XXX This needs to handle fixed position as well... // See if it's absolute positioned or fixed positioned
if (NS_STYLE_POSITION_ABSOLUTE == position->mPosition) {
// See if it's absolutely positioned isAbsolutelyPositioned = PR_TRUE;
isAbsolutelyPositioned = NS_STYLE_POSITION_ABSOLUTE == position->mPosition; } else if (NS_STYLE_POSITION_FIXED == position->mPosition) {
isFixedPositioned = PR_TRUE;
}
// Create a scroll frame // Create a scroll frame
nsIFrame* scrollFrame; nsIFrame* scrollFrame;
@ -3209,7 +3218,7 @@ HTMLStyleSheetImpl::ConstructFrameByDisplayType(nsIPresContext* aPresConte
// Initialize it // Initialize it
InitializeScrollFrame(scrollFrame, aPresContext, aContent, aParentFrame, aStyleContext, InitializeScrollFrame(scrollFrame, aPresContext, aContent, aParentFrame, aStyleContext,
aAbsoluteItems, newFrame, aFixedItems, aAbsoluteItems, newFrame, aFixedItems,
isAbsolutelyPositioned, PR_FALSE); isAbsolutelyPositioned, isFixedPositioned, PR_FALSE);
#if 0 // XXX The following "ifdef" could has been moved to the method "InitializeScrollFrame" #if 0 // XXX The following "ifdef" could has been moved to the method "InitializeScrollFrame"
nsIFrame* geometricParent = isAbsolutelyPositioned ? aAbsoluteItems.containingBlock : nsIFrame* geometricParent = isAbsolutelyPositioned ? aAbsoluteItems.containingBlock :
@ -3260,7 +3269,7 @@ HTMLStyleSheetImpl::ConstructFrameByDisplayType(nsIPresContext* aPresConte
aNewFrame = scrollFrame; aNewFrame = scrollFrame;
#endif #endif
// See if the frame is absolutely positioned // See if the frame is absolute or fixed positioned
} else if (position->IsAbsolutelyPositioned() && } else if (position->IsAbsolutelyPositioned() &&
((NS_STYLE_DISPLAY_BLOCK == aDisplay->mDisplay) || ((NS_STYLE_DISPLAY_BLOCK == aDisplay->mDisplay) ||
(NS_STYLE_DISPLAY_INLINE == aDisplay->mDisplay) || (NS_STYLE_DISPLAY_INLINE == aDisplay->mDisplay) ||