corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added code to check the placeholder's out-of-flow frame and see if it's

Browse Source 
an absolutely positioned frame and not just assume it's a floater
This commit is contained in:
troy@netscape.com
1999-04-25 17:01:07 +00:00
parent dd403bbac3
commit 21497ca5ab
2 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
layout/generic/nsLineLayout.cpp
View File

@@ -27,6 +27,7 @@
#include "nsIFontMetrics.h"
#include "nsIRenderingContext.h"
#include "nsLayoutAtoms.h"
#include "nsPlaceholderFrame.h"
#ifdef DEBUG
#undef NOISY_HORIZONTAL_ALIGN
@@ -842,11 +843,20 @@ nsLineLayout::ReflowFrame(nsIFrame* aFrame,
aFrame->GetFrameType(&frameType);
if (frameType) {
if (frameType == nsLayoutAtoms::placeholderFrame) {
if (eReflowReason_Incremental == reason) {
InitFloater((nsPlaceholderFrame*)aFrame);
}
else {
AddFloater((nsPlaceholderFrame*)aFrame);
nsIFrame* outOfFlowFrame = ((nsPlaceholderFrame*)aFrame)->GetOutOfFlowFrame();
if (outOfFlowFrame) {
const nsStylePosition* position;
// Make sure it's floated and not absolutely positioned
outOfFlowFrame->GetStyleData(eStyleStruct_Position, (const nsStyleStruct*&)position);
if (!position->IsAbsolutelyPositioned()) {
if (eReflowReason_Incremental == reason) {
InitFloater((nsPlaceholderFrame*)aFrame);
}
else {
AddFloater((nsPlaceholderFrame*)aFrame);
}
}
}
}
NS_RELEASE(frameType);

20
layout/html/base/src/nsLineLayout.cpp
View File

@@ -27,6 +27,7 @@
#include "nsIFontMetrics.h"
#include "nsIRenderingContext.h"
#include "nsLayoutAtoms.h"
#include "nsPlaceholderFrame.h"
#ifdef DEBUG
#undef NOISY_HORIZONTAL_ALIGN
@@ -842,11 +843,20 @@ nsLineLayout::ReflowFrame(nsIFrame* aFrame,
aFrame->GetFrameType(&frameType);
if (frameType) {
if (frameType == nsLayoutAtoms::placeholderFrame) {
if (eReflowReason_Incremental == reason) {
InitFloater((nsPlaceholderFrame*)aFrame);
}
else {
AddFloater((nsPlaceholderFrame*)aFrame);
nsIFrame* outOfFlowFrame = ((nsPlaceholderFrame*)aFrame)->GetOutOfFlowFrame();
if (outOfFlowFrame) {
const nsStylePosition* position;
// Make sure it's floated and not absolutely positioned
outOfFlowFrame->GetStyleData(eStyleStruct_Position, (const nsStyleStruct*&)position);
if (!position->IsAbsolutelyPositioned()) {
if (eReflowReason_Incremental == reason) {
InitFloater((nsPlaceholderFrame*)aFrame);
}
else {
AddFloater((nsPlaceholderFrame*)aFrame);
}
}
}
}
NS_RELEASE(frameType);