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

Fixed items are now removed in ReconstructDocElementHierarchy. b=42114, r=buster@netscape.com

This commit is contained in:
attinasi%netscape.com 2000-08-30 18:51:45 +00:00
Родитель 17a5487872
Коммит 551e38cfa8
4 изменённых файлов: 112 добавлений и 38 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

72
layout/base/nsCSSFrameConstructor.cpp
Просмотреть файл

@ -7560,11 +7560,13 @@ nsCSSFrameConstructor::ConstructFrameInternal( nsIPresShell* aPresShe
NS_IMETHODIMP
nsCSSFrameConstructor::ReconstructDocElementHierarchy(nsIPresContext* aPresContext)
{
NS_PRECONDITION(aPresContext, "null pres context argument");
nsresult rv = NS_OK;
nsCOMPtr<nsIPresShell> shell;
aPresContext->GetShell(getter_AddRefs(shell));
if (nsnull != mDocument) {
if (nsnull != mDocument && shell) {
nsCOMPtr<nsIContent> rootContent(dont_AddRef(mDocument->GetRootContent()));
if (rootContent) {
@ -7594,27 +7596,30 @@ nsCSSFrameConstructor::ReconstructDocElementHierarchy(nsIPresContext* aPresConte
rv = state.mFrameManager->RemoveFrame(aPresContext, *shell,
docParentFrame, nsnull,
docElementFrame);
// XXX Remove any existing fixed items...
if (NS_SUCCEEDED(rv)) {
// Create the new document element hierarchy
nsIFrame* newChild;
nsCOMPtr<nsIStyleContext> rootPseudoStyle;
docParentFrame->GetStyleContext(getter_AddRefs(rootPseudoStyle));
rv = ConstructDocElementFrame(shell, aPresContext, state, rootContent,
docParentFrame, rootPseudoStyle,
newChild);
// Remove any existing fixed items: they are always on the FixedContainingBlock
rv = RemoveFixedItems(*aPresContext, *shell);
if (NS_SUCCEEDED(rv)) {
rv = state.mFrameManager->InsertFrames(aPresContext, *shell,
docParentFrame, nsnull,
nsnull, newChild);
// Create the new document element hierarchy
nsIFrame* newChild;
nsCOMPtr<nsIStyleContext> rootPseudoStyle;
docParentFrame->GetStyleContext(getter_AddRefs(rootPseudoStyle));
rv = ConstructDocElementFrame(shell, aPresContext, state, rootContent,
docParentFrame, rootPseudoStyle,
newChild);
// Tell the fixed containing block about its 'fixed' frames
if (state.mFixedItems.childList) {
state.mFrameManager->InsertFrames(aPresContext, *shell,
mFixedContainingBlock, nsLayoutAtoms::fixedList,
nsnull, state.mFixedItems.childList);
if (NS_SUCCEEDED(rv)) {
rv = state.mFrameManager->InsertFrames(aPresContext, *shell,
docParentFrame, nsnull,
nsnull, newChild);
// Tell the fixed containing block about its 'fixed' frames
if (state.mFixedItems.childList) {
state.mFrameManager->InsertFrames(aPresContext, *shell,
mFixedContainingBlock, nsLayoutAtoms::fixedList,
nsnull, state.mFixedItems.childList);
}
}
}
}
@ -13035,3 +13040,32 @@ nsCSSFrameConstructor::RecreateEntireFrameTree(nsIPresContext* aPresContext)
// XXX write me some day
return NS_OK;
}
nsresult nsCSSFrameConstructor::RemoveFixedItems(nsIPresContext& aPresContext,
nsIPresShell& aPresShell)
{
nsresult rv=NS_OK;
if (mFixedContainingBlock) {
nsIFrame *fixedChild = nsnull;
do {
mFixedContainingBlock->FirstChild(&aPresContext,
nsLayoutAtoms::fixedList,
&fixedChild);
if (fixedChild) {
rv = mFixedContainingBlock->RemoveFrame(&aPresContext,
aPresShell,
nsLayoutAtoms::fixedList,
fixedChild);
if (NS_FAILED(rv)) {
NS_WARNING("Error removing frame from fixed containing block in RemoveFixedItems");
break;
}
}
} while(fixedChild);
} else {
NS_WARNING( "RemoveDixedItems called with no FixedContainingBlock data member set");
}
return rv;
}

3
layout/base/nsCSSFrameConstructor.h
Просмотреть файл

@ -924,6 +924,9 @@ protected:
nsIFrame* aPrevSibling,
nsFrameItems& aFrameItems);
nsresult RemoveFixedItems(nsIPresContext& aPresContext,
nsIPresShell& aPresShell);
protected:
nsIDocument* mDocument;

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

@ -7560,11 +7560,13 @@ nsCSSFrameConstructor::ConstructFrameInternal( nsIPresShell* aPresShe
NS_IMETHODIMP
nsCSSFrameConstructor::ReconstructDocElementHierarchy(nsIPresContext* aPresContext)
{
NS_PRECONDITION(aPresContext, "null pres context argument");
nsresult rv = NS_OK;
nsCOMPtr<nsIPresShell> shell;
aPresContext->GetShell(getter_AddRefs(shell));
if (nsnull != mDocument) {
if (nsnull != mDocument && shell) {
nsCOMPtr<nsIContent> rootContent(dont_AddRef(mDocument->GetRootContent()));
if (rootContent) {
@ -7594,27 +7596,30 @@ nsCSSFrameConstructor::ReconstructDocElementHierarchy(nsIPresContext* aPresConte
rv = state.mFrameManager->RemoveFrame(aPresContext, *shell,
docParentFrame, nsnull,
docElementFrame);
// XXX Remove any existing fixed items...
if (NS_SUCCEEDED(rv)) {
// Create the new document element hierarchy
nsIFrame* newChild;
nsCOMPtr<nsIStyleContext> rootPseudoStyle;
docParentFrame->GetStyleContext(getter_AddRefs(rootPseudoStyle));
rv = ConstructDocElementFrame(shell, aPresContext, state, rootContent,
docParentFrame, rootPseudoStyle,
newChild);
// Remove any existing fixed items: they are always on the FixedContainingBlock
rv = RemoveFixedItems(*aPresContext, *shell);
if (NS_SUCCEEDED(rv)) {
rv = state.mFrameManager->InsertFrames(aPresContext, *shell,
docParentFrame, nsnull,
nsnull, newChild);
// Create the new document element hierarchy
nsIFrame* newChild;
nsCOMPtr<nsIStyleContext> rootPseudoStyle;
docParentFrame->GetStyleContext(getter_AddRefs(rootPseudoStyle));
rv = ConstructDocElementFrame(shell, aPresContext, state, rootContent,
docParentFrame, rootPseudoStyle,
newChild);
// Tell the fixed containing block about its 'fixed' frames
if (state.mFixedItems.childList) {
state.mFrameManager->InsertFrames(aPresContext, *shell,
mFixedContainingBlock, nsLayoutAtoms::fixedList,
nsnull, state.mFixedItems.childList);
if (NS_SUCCEEDED(rv)) {
rv = state.mFrameManager->InsertFrames(aPresContext, *shell,
docParentFrame, nsnull,
nsnull, newChild);
// Tell the fixed containing block about its 'fixed' frames
if (state.mFixedItems.childList) {
state.mFrameManager->InsertFrames(aPresContext, *shell,
mFixedContainingBlock, nsLayoutAtoms::fixedList,
nsnull, state.mFixedItems.childList);
}
}
}
}
@ -13035,3 +13040,32 @@ nsCSSFrameConstructor::RecreateEntireFrameTree(nsIPresContext* aPresContext)
// XXX write me some day
return NS_OK;
}
nsresult nsCSSFrameConstructor::RemoveFixedItems(nsIPresContext& aPresContext,
nsIPresShell& aPresShell)
{
nsresult rv=NS_OK;
if (mFixedContainingBlock) {
nsIFrame *fixedChild = nsnull;
do {
mFixedContainingBlock->FirstChild(&aPresContext,
nsLayoutAtoms::fixedList,
&fixedChild);
if (fixedChild) {
rv = mFixedContainingBlock->RemoveFrame(&aPresContext,
aPresShell,
nsLayoutAtoms::fixedList,
fixedChild);
if (NS_FAILED(rv)) {
NS_WARNING("Error removing frame from fixed containing block in RemoveFixedItems");
break;
}
}
} while(fixedChild);
} else {
NS_WARNING( "RemoveDixedItems called with no FixedContainingBlock data member set");
}
return rv;
}

3
layout/html/style/src/nsCSSFrameConstructor.h
Просмотреть файл

@ -924,6 +924,9 @@ protected:
nsIFrame* aPrevSibling,
nsFrameItems& aFrameItems);
nsresult RemoveFixedItems(nsIPresContext& aPresContext,
nsIPresShell& aPresShell);
protected:
nsIDocument* mDocument;