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

Use lineLayout object to pass on floater to the containing block

This commit is contained in:
kipp%netscape.com 1998-11-10 18:04:34 +00:00
Родитель 936937c930
Коммит 70b6a98a18
2 изменённых файлов: 16 добавлений и 52 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

32
layout/generic/nsPlaceholderFrame.cpp
Просмотреть файл

@ -89,40 +89,22 @@ nsPlaceholderFrame::Reflow(nsIPresContext& aPresContext,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus)
{
// Get the floater container in which we're inserted
nsIFrame* containingBlock;
nsIFloaterContainer* container = nsnull;
for (containingBlock = mGeometricParent;
nsnull != containingBlock;
containingBlock->GetGeometricParent(containingBlock))
{
if (NS_OK == containingBlock->QueryInterface(kIFloaterContainerIID, (void**)&container)) {
break;
}
}
NS_ASSERTION(nsnull != container, "no floater container");
if (nsnull != aReflowState.lineLayout) {
if (eReflowReason_Initial == aReflowState.reason) {
// By this point we expect to have been told which anchored item we're
// associated with
NS_ASSERTION(nsnull != mAnchoredItem, "no anchored item");
// Notify our containing block that there's a new floater
container->AddFloater(&aPresContext, aReflowState, mAnchoredItem, this);
aReflowState.lineLayout->InitFloater(this);
}
// Let line layout know about the floater
NS_ASSERTION(nsnull != aReflowState.lineLayout, "no line layout");
else {
aReflowState.lineLayout->AddFloater(this);
}
}
aDesiredSize.width = 0;
aDesiredSize.height = 0;
aDesiredSize.ascent = 0;
aDesiredSize.descent = 0;
if (nsnull != aDesiredSize.maxElementSize) {
aDesiredSize.maxElementSize->width = aDesiredSize.width;
aDesiredSize.maxElementSize->height = aDesiredSize.height;
aDesiredSize.maxElementSize->width = 0;
aDesiredSize.maxElementSize->height = 0;
}
aStatus = NS_FRAME_COMPLETE;

32
layout/html/base/src/nsPlaceholderFrame.cpp
Просмотреть файл

@ -89,40 +89,22 @@ nsPlaceholderFrame::Reflow(nsIPresContext& aPresContext,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus)
{
// Get the floater container in which we're inserted
nsIFrame* containingBlock;
nsIFloaterContainer* container = nsnull;
for (containingBlock = mGeometricParent;
nsnull != containingBlock;
containingBlock->GetGeometricParent(containingBlock))
{
if (NS_OK == containingBlock->QueryInterface(kIFloaterContainerIID, (void**)&container)) {
break;
}
}
NS_ASSERTION(nsnull != container, "no floater container");
if (nsnull != aReflowState.lineLayout) {
if (eReflowReason_Initial == aReflowState.reason) {
// By this point we expect to have been told which anchored item we're
// associated with
NS_ASSERTION(nsnull != mAnchoredItem, "no anchored item");
// Notify our containing block that there's a new floater
container->AddFloater(&aPresContext, aReflowState, mAnchoredItem, this);
aReflowState.lineLayout->InitFloater(this);
}
// Let line layout know about the floater
NS_ASSERTION(nsnull != aReflowState.lineLayout, "no line layout");
else {
aReflowState.lineLayout->AddFloater(this);
}
}
aDesiredSize.width = 0;
aDesiredSize.height = 0;
aDesiredSize.ascent = 0;
aDesiredSize.descent = 0;
if (nsnull != aDesiredSize.maxElementSize) {
aDesiredSize.maxElementSize->width = aDesiredSize.width;
aDesiredSize.maxElementSize->height = aDesiredSize.height;
aDesiredSize.maxElementSize->width = 0;
aDesiredSize.maxElementSize->height = 0;
}
aStatus = NS_FRAME_COMPLETE;