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

Changed splittable enum to be bit flags

Browse Source
This commit is contained in:
troy 1998-05-22 04:54:11 +00:00
parent a476e5c2cd
commit 6204c78831
26 changed files with 128 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
layout/base/public/nsIFrame.h
View File

@ -75,9 +75,14 @@ enum nsReflowReason {
eReflowReason_Resize // general request to determine a desired size
};
/**
* Reflow state passed to a frame during reflow.
*
* @see #Reflow()
*/
struct nsReflowState {
nsReflowReason reason; // the reason for the reflow
nsReflowCommand& reflowCommand; // only used for incremental changes
// nsReflowCommand& reflowCommand; // only used for incremental changes
nsSize maxSize; // the available space in which to reflow
};
@ -113,6 +118,33 @@ typedef PRUint32 nsReflowStatus;
//----------------------------------------------------------------------
/**
* Indication of how the frame can be split. This is used when doing runaround
* of floaters, and when pulling up child frames from a next-in-flow.
*
* The choices are splittable, not splittable at all, and splittable in
* a non-rectangular fashion. This last type only applies to block-level
* elements, and indicates whether splitting can be used when doing runaround.
* If you can split across page boundaries, but you expect each continuing
* frame to be the same width then return frSplittable and not
* frSplittableNonRectangular.
*
* @see #IsSplittable()
*/
typedef PRUint32 nsSplittableType;
#define NS_FRAME_NOT_SPLITTABLE 0 // Note: not a bit!
#define NS_FRAME_SPLITTABLE 0x1
#define NS_FRAME_SPLITTABLE_NON_RECTANGULAR 0x3
#define NS_FRAME_IS_SPLITTABLE(type)\
(0 != ((type) & NS_FRAME_SPLITTABLE))
#define NS_FRAME_IS_NOT_SPLITTABLE(type)\
(0 == ((type) & NS_FRAME_SPLITTABLE))
//----------------------------------------------------------------------
/**
* Frame state bits. Any bits not listed here are reserved for future
* extensions, but must be stored by the frames.
@ -445,25 +477,10 @@ public:
NS_IMETHOD GetReflowMetrics(nsIPresContext* aPresContext,
nsReflowMetrics& aMetrics) = 0;
/**
* Indication of how the frame can be split. This is used when doing runaround
* of floaters, and when pulling up child frames from a next-in-flow.
*
* The choices are splittable, not splittable at all, and splittable in
* a non-rectangular fashion. This last type only applies to block-level
* elements, and indicates whether splitting can be used when doing runaround.
* If you can split across page boundaries, but you expect each continuing
* frame to be the same width then return frSplittable and not
* frSplittableNonRectangular.
*
* @see #IsSplittable()
*/
enum SplittableType {NotSplittable = 0, Splittable = 1, SplittableNonRectangular = 3};
/**
* Return how your frame can be split.
*/
NS_IMETHOD IsSplittable(SplittableType& aIsSplittable) const = 0;
NS_IMETHOD IsSplittable(nsSplittableType& aIsSplittable) const = 0;
/**
* Flow member functions. CreateContinuingFrame() is responsible for

4
layout/base/src/nsFrame.cpp
View File

@ -1120,9 +1120,9 @@ NS_METHOD nsFrame::GetReflowMetrics(nsIPresContext* aPresContext,
// Flow member functions
NS_METHOD nsFrame::IsSplittable(SplittableType& aIsSplittable) const
NS_METHOD nsFrame::IsSplittable(nsSplittableType& aIsSplittable) const
{
aIsSplittable = NotSplittable;
aIsSplittable = NS_FRAME_NOT_SPLITTABLE;
return NS_OK;
}

2
layout/base/src/nsFrame.h
View File

@ -178,7 +178,7 @@ public:
nsReflowMetrics& aMetrics);
// Flow member functions
NS_IMETHOD IsSplittable(SplittableType& aIsSplittable) const;
NS_IMETHOD IsSplittable(nsSplittableType& aIsSplittable) const;
NS_IMETHOD CreateContinuingFrame(nsIPresContext* aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,

4
layout/base/src/nsSplittableFrame.cpp
View File

@ -34,9 +34,9 @@ nsSplittableFrame::~nsSplittableFrame()
// Flow member functions
NS_METHOD nsSplittableFrame::IsSplittable(SplittableType& aIsSplittable) const
NS_METHOD nsSplittableFrame::IsSplittable(nsSplittableType& aIsSplittable) const
{
aIsSplittable = Splittable;
aIsSplittable = NS_FRAME_SPLITTABLE;
return NS_OK;
}

2
layout/base/src/nsSplittableFrame.h
View File

@ -26,7 +26,7 @@ class nsSplittableFrame : public nsFrame
public:
// CreateContinuingFrame() does the default behavior of using the
// content delegate to create a new frame
NS_IMETHOD IsSplittable(SplittableType& aIsSplittable) const;
NS_IMETHOD IsSplittable(nsSplittableType& aIsSplittable) const;
NS_IMETHOD CreateContinuingFrame(nsIPresContext* aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,

4
layout/generic/nsBlockFrame.cpp
View File

@ -243,9 +243,9 @@ nsBlockFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
}
NS_METHOD
nsBlockFrame::IsSplittable(SplittableType& aIsSplittable) const
nsBlockFrame::IsSplittable(nsSplittableType& aIsSplittable) const
{
aIsSplittable = SplittableNonRectangular;
aIsSplittable = NS_FRAME_SPLITTABLE_NON_RECTANGULAR;
return NS_OK;
}

2
layout/generic/nsBlockFrame.h
View File

@ -179,7 +179,7 @@ public:
PRInt32 aIndexInParent);
NS_IMETHOD GetReflowMetrics(nsIPresContext* aPresContext,
nsReflowMetrics& aMetrics);
NS_IMETHOD IsSplittable(SplittableType& aIsSplittable) const;
NS_IMETHOD IsSplittable(nsSplittableType& aIsSplittable) const;
NS_IMETHOD CreateContinuingFrame(nsIPresContext* aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,

4
layout/generic/nsBlockReflowState.cpp
View File

@ -243,9 +243,9 @@ nsBlockFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
}
NS_METHOD
nsBlockFrame::IsSplittable(SplittableType& aIsSplittable) const
nsBlockFrame::IsSplittable(nsSplittableType& aIsSplittable) const
{
aIsSplittable = SplittableNonRectangular;
aIsSplittable = NS_FRAME_SPLITTABLE_NON_RECTANGULAR;
return NS_OK;
}

4
layout/generic/nsBlockReflowState.h
View File

@ -243,9 +243,9 @@ nsBlockFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
}
NS_METHOD
nsBlockFrame::IsSplittable(SplittableType& aIsSplittable) const
nsBlockFrame::IsSplittable(nsSplittableType& aIsSplittable) const
{
aIsSplittable = SplittableNonRectangular;
aIsSplittable = NS_FRAME_SPLITTABLE_NON_RECTANGULAR;
return NS_OK;
}

51
layout/generic/nsIFrame.h
View File

@ -75,9 +75,14 @@ enum nsReflowReason {
eReflowReason_Resize // general request to determine a desired size
};
/**
* Reflow state passed to a frame during reflow.
*
* @see #Reflow()
*/
struct nsReflowState {
nsReflowReason reason; // the reason for the reflow
nsReflowCommand& reflowCommand; // only used for incremental changes
// nsReflowCommand& reflowCommand; // only used for incremental changes
nsSize maxSize; // the available space in which to reflow
};
@ -113,6 +118,33 @@ typedef PRUint32 nsReflowStatus;
//----------------------------------------------------------------------
/**
* Indication of how the frame can be split. This is used when doing runaround
* of floaters, and when pulling up child frames from a next-in-flow.
*
* The choices are splittable, not splittable at all, and splittable in
* a non-rectangular fashion. This last type only applies to block-level
* elements, and indicates whether splitting can be used when doing runaround.
* If you can split across page boundaries, but you expect each continuing
* frame to be the same width then return frSplittable and not
* frSplittableNonRectangular.
*
* @see #IsSplittable()
*/
typedef PRUint32 nsSplittableType;
#define NS_FRAME_NOT_SPLITTABLE 0 // Note: not a bit!
#define NS_FRAME_SPLITTABLE 0x1
#define NS_FRAME_SPLITTABLE_NON_RECTANGULAR 0x3
#define NS_FRAME_IS_SPLITTABLE(type)\
(0 != ((type) & NS_FRAME_SPLITTABLE))
#define NS_FRAME_IS_NOT_SPLITTABLE(type)\
(0 == ((type) & NS_FRAME_SPLITTABLE))
//----------------------------------------------------------------------
/**
* Frame state bits. Any bits not listed here are reserved for future
* extensions, but must be stored by the frames.
@ -445,25 +477,10 @@ public:
NS_IMETHOD GetReflowMetrics(nsIPresContext* aPresContext,
nsReflowMetrics& aMetrics) = 0;
/**
* Indication of how the frame can be split. This is used when doing runaround
* of floaters, and when pulling up child frames from a next-in-flow.
*
* The choices are splittable, not splittable at all, and splittable in
* a non-rectangular fashion. This last type only applies to block-level
* elements, and indicates whether splitting can be used when doing runaround.
* If you can split across page boundaries, but you expect each continuing
* frame to be the same width then return frSplittable and not
* frSplittableNonRectangular.
*
* @see #IsSplittable()
*/
enum SplittableType {NotSplittable = 0, Splittable = 1, SplittableNonRectangular = 3};
/**
* Return how your frame can be split.
*/
NS_IMETHOD IsSplittable(SplittableType& aIsSplittable) const = 0;
NS_IMETHOD IsSplittable(nsSplittableType& aIsSplittable) const = 0;
/**
* Flow member functions. CreateContinuingFrame() is responsible for

4
layout/generic/nsInlineFrame.cpp
View File

@ -389,12 +389,12 @@ PRBool nsInlineFrame::PullUpChildren(nsIPresContext* aPresContext,
// it's splittable then reflow it. The reason we can't just move
// it is that we still need ascent/descent information
nsSize kidFrameSize;
SplittableType kidIsSplittable;
nsSplittableType kidIsSplittable;
kidFrame->GetSize(kidFrameSize);
kidFrame->IsSplittable(kidIsSplittable);
if ((kidFrameSize.width > aState.availSize.width) &&
(kidIsSplittable == NotSplittable)) {
NS_FRAME_IS_NOT_SPLITTABLE(kidIsSplittable)) {
result = PR_FALSE;
mLastContentIsComplete = prevLastContentIsComplete;
break;

10
layout/generic/nsLineLayout.cpp
View File

@ -374,11 +374,11 @@ nsLineLayout::ReflowMappedChild()
// If we need the max-element size and we are splittable then we
// have to reflow to get it.
nsIFrame::SplittableType splits;
nsSplittableType splits;
mKidFrame->IsSplittable(splits);
#if 0
if (nsnull != mMaxElementSizePointer) {
if (nsIFrame::NotSplittable != splits) {
if (NS_FRAME_IS_SPLITTABLE(splits)) {
NS_FRAME_LOG(NS_FRAME_TRACE_CHILD_REFLOW,
("nsLineLayout::ReflowMappedChild: need max-element-size"));
return ReflowChild(nsnull);
@ -390,7 +390,7 @@ nsLineLayout::ReflowMappedChild()
// here to properly handle reflow avoidance. To do that properly we
// really need a first-rate protocol here (WillPlace?
// CanAvoidReflow?) that gets the frame involved.
if (nsIFrame::NotSplittable != splits) {
if (NS_FRAME_IS_SPLITTABLE(splits)) {
NS_FRAME_LOG(NS_FRAME_TRACE_CHILD_REFLOW,
("nsLineLayout::ReflowMappedChild: splittable hack"));
return ReflowChild(nsnull);
@ -413,7 +413,7 @@ nsLineLayout::ReflowMappedChild()
return ReflowChild(nsnull);
}
if (nsIFrame::NotSplittable != splits) {
if (NS_FRAME_IS_SPLITTABLE(splits)) {
// XXX a next-in-flow propogated dirty-bit eliminates this code
// The splittable frame has not yet been reflowed. This means
@ -530,7 +530,7 @@ nsLineLayout::ReflowMappedChild()
// The child doesn't fit as is; if it's splittable then reflow it
// otherwise return break-before status so that the non-splittable
// child is pushed to the next line.
if (nsIFrame::NotSplittable != splits) {
if (NS_FRAME_IS_SPLITTABLE(splits)) {
NS_FRAME_LOG(NS_FRAME_TRACE_CHILD_REFLOW,
("nsLineLayout::ReflowMappedChild: can't directly fit"));
return ReflowChild(nsnull);

4
layout/html/base/src/nsBlockFrame.cpp
View File

@ -243,9 +243,9 @@ nsBlockFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
}
NS_METHOD
nsBlockFrame::IsSplittable(SplittableType& aIsSplittable) const
nsBlockFrame::IsSplittable(nsSplittableType& aIsSplittable) const
{
aIsSplittable = SplittableNonRectangular;
aIsSplittable = NS_FRAME_SPLITTABLE_NON_RECTANGULAR;
return NS_OK;
}

2
layout/html/base/src/nsBlockFrame.h
View File

@ -179,7 +179,7 @@ public:
PRInt32 aIndexInParent);
NS_IMETHOD GetReflowMetrics(nsIPresContext* aPresContext,
nsReflowMetrics& aMetrics);
NS_IMETHOD IsSplittable(SplittableType& aIsSplittable) const;
NS_IMETHOD IsSplittable(nsSplittableType& aIsSplittable) const;
NS_IMETHOD CreateContinuingFrame(nsIPresContext* aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,

4
layout/html/base/src/nsBlockReflowState.cpp
View File

@ -243,9 +243,9 @@ nsBlockFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
}
NS_METHOD
nsBlockFrame::IsSplittable(SplittableType& aIsSplittable) const
nsBlockFrame::IsSplittable(nsSplittableType& aIsSplittable) const
{
aIsSplittable = SplittableNonRectangular;
aIsSplittable = NS_FRAME_SPLITTABLE_NON_RECTANGULAR;
return NS_OK;
}

4
layout/html/base/src/nsBlockReflowState.h
View File

@ -243,9 +243,9 @@ nsBlockFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
}
NS_METHOD
nsBlockFrame::IsSplittable(SplittableType& aIsSplittable) const
nsBlockFrame::IsSplittable(nsSplittableType& aIsSplittable) const
{
aIsSplittable = SplittableNonRectangular;
aIsSplittable = NS_FRAME_SPLITTABLE_NON_RECTANGULAR;
return NS_OK;
}

4
layout/html/base/src/nsInlineFrame.cpp
View File

@ -389,12 +389,12 @@ PRBool nsInlineFrame::PullUpChildren(nsIPresContext* aPresContext,
// it's splittable then reflow it. The reason we can't just move
// it is that we still need ascent/descent information
nsSize kidFrameSize;
SplittableType kidIsSplittable;
nsSplittableType kidIsSplittable;
kidFrame->GetSize(kidFrameSize);
kidFrame->IsSplittable(kidIsSplittable);
if ((kidFrameSize.width > aState.availSize.width) &&
(kidIsSplittable == NotSplittable)) {
NS_FRAME_IS_NOT_SPLITTABLE(kidIsSplittable)) {
result = PR_FALSE;
mLastContentIsComplete = prevLastContentIsComplete;
break;

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

@ -374,11 +374,11 @@ nsLineLayout::ReflowMappedChild()
// If we need the max-element size and we are splittable then we
// have to reflow to get it.
nsIFrame::SplittableType splits;
nsSplittableType splits;
mKidFrame->IsSplittable(splits);
#if 0
if (nsnull != mMaxElementSizePointer) {
if (nsIFrame::NotSplittable != splits) {
if (NS_FRAME_IS_SPLITTABLE(splits)) {
NS_FRAME_LOG(NS_FRAME_TRACE_CHILD_REFLOW,
("nsLineLayout::ReflowMappedChild: need max-element-size"));
return ReflowChild(nsnull);
@ -390,7 +390,7 @@ nsLineLayout::ReflowMappedChild()
// here to properly handle reflow avoidance. To do that properly we
// really need a first-rate protocol here (WillPlace?
// CanAvoidReflow?) that gets the frame involved.
if (nsIFrame::NotSplittable != splits) {
if (NS_FRAME_IS_SPLITTABLE(splits)) {
NS_FRAME_LOG(NS_FRAME_TRACE_CHILD_REFLOW,
("nsLineLayout::ReflowMappedChild: splittable hack"));
return ReflowChild(nsnull);
@ -413,7 +413,7 @@ nsLineLayout::ReflowMappedChild()
return ReflowChild(nsnull);
}
if (nsIFrame::NotSplittable != splits) {
if (NS_FRAME_IS_SPLITTABLE(splits)) {
// XXX a next-in-flow propogated dirty-bit eliminates this code
// The splittable frame has not yet been reflowed. This means
@ -530,7 +530,7 @@ nsLineLayout::ReflowMappedChild()
// The child doesn't fit as is; if it's splittable then reflow it
// otherwise return break-before status so that the non-splittable
// child is pushed to the next line.
if (nsIFrame::NotSplittable != splits) {
if (NS_FRAME_IS_SPLITTABLE(splits)) {
NS_FRAME_LOG(NS_FRAME_TRACE_CHILD_REFLOW,
("nsLineLayout::ReflowMappedChild: can't directly fit"));
return ReflowChild(nsnull);

4
layout/html/table/src/nsTableFrame.cpp
View File

@ -1220,12 +1220,12 @@ PRBool nsTableFrame::PullUpChildren(nsIPresContext* aPresContext,
// it's splittable then reflow it. The reason we can't just move
// it is that we still need ascent/descent information
nsSize kidFrameSize;
SplittableType kidIsSplittable;
nsSplittableType kidIsSplittable;
kidFrame->GetSize(kidFrameSize);
kidFrame->IsSplittable(kidIsSplittable);
if ((kidFrameSize.height > aState.availSize.height) &&
(kidIsSplittable == NotSplittable)) {
NS_FRAME_IS_NOT_SPLITTABLE(kidIsSplittable)) {
result = PR_FALSE;
mLastContentIsComplete = prevLastContentIsComplete;
break;

4
layout/html/table/src/nsTableOuterFrame.cpp
View File

@ -689,13 +689,13 @@ PRBool nsTableOuterFrame::PullUpChildren( nsIPresContext* aPresContext,
// it's splittable then reflow it. The reason we can't just move
// it is that we still need ascent/descent information
nsSize kidFrameSize;
SplittableType kidIsSplittable;
nsSplittableType kidIsSplittable;
kidFrame->GetSize(kidFrameSize);
kidFrame->IsSplittable(kidIsSplittable);
if ((kidFrameSize.width > aState.availSize.height) &&
(kidIsSplittable == NotSplittable)) {
NS_FRAME_IS_NOT_SPLITTABLE(kidIsSplittable)) {
result = PR_FALSE;
mLastContentIsComplete = prevLastContentIsComplete;
break;

4
layout/html/table/src/nsTableRowFrame.cpp
View File

@ -605,13 +605,13 @@ PRBool nsTableRowFrame::PullUpChildren(nsIPresContext* aPresContext,
// it's splittable then reflow it. The reason we can't just move
// it is that we still need ascent/descent information
nsSize kidFrameSize;
SplittableType kidIsSplittable;
nsSplittableType kidIsSplittable;
kidFrame->GetSize(kidFrameSize);
kidFrame->IsSplittable(kidIsSplittable);
if ((kidFrameSize.height > aState.availSize.height) &&
(kidIsSplittable == NotSplittable)) {
NS_FRAME_IS_NOT_SPLITTABLE(kidIsSplittable)) {
result = PR_FALSE;
mLastContentIsComplete = prevLastContentIsComplete;
break;

4
layout/html/table/src/nsTableRowGroupFrame.cpp
View File

@ -520,12 +520,12 @@ PRBool nsTableRowGroupFrame::PullUpChildren(nsIPresContext* aPresContext,
// it's splittable then reflow it. The reason we can't just move
// it is that we still need ascent/descent information
nsSize kidFrameSize;
SplittableType kidIsSplittable;
nsSplittableType kidIsSplittable;
kidFrame->GetSize(kidFrameSize);
kidFrame->IsSplittable(kidIsSplittable);
if ((kidFrameSize.height > aState.availSize.height) &&
(kidIsSplittable == NotSplittable)) {
NS_FRAME_IS_NOT_SPLITTABLE(kidIsSplittable)) {
result = PR_FALSE;
mLastContentIsComplete = prevLastContentIsComplete;
break;

4
layout/tables/nsTableFrame.cpp
View File

@ -1220,12 +1220,12 @@ PRBool nsTableFrame::PullUpChildren(nsIPresContext* aPresContext,
// it's splittable then reflow it. The reason we can't just move
// it is that we still need ascent/descent information
nsSize kidFrameSize;
SplittableType kidIsSplittable;
nsSplittableType kidIsSplittable;
kidFrame->GetSize(kidFrameSize);
kidFrame->IsSplittable(kidIsSplittable);
if ((kidFrameSize.height > aState.availSize.height) &&
(kidIsSplittable == NotSplittable)) {
NS_FRAME_IS_NOT_SPLITTABLE(kidIsSplittable)) {
result = PR_FALSE;
mLastContentIsComplete = prevLastContentIsComplete;
break;

4
layout/tables/nsTableOuterFrame.cpp
View File

@ -689,13 +689,13 @@ PRBool nsTableOuterFrame::PullUpChildren( nsIPresContext* aPresContext,
// it's splittable then reflow it. The reason we can't just move
// it is that we still need ascent/descent information
nsSize kidFrameSize;
SplittableType kidIsSplittable;
nsSplittableType kidIsSplittable;
kidFrame->GetSize(kidFrameSize);
kidFrame->IsSplittable(kidIsSplittable);
if ((kidFrameSize.width > aState.availSize.height) &&
(kidIsSplittable == NotSplittable)) {
NS_FRAME_IS_NOT_SPLITTABLE(kidIsSplittable)) {
result = PR_FALSE;
mLastContentIsComplete = prevLastContentIsComplete;
break;

4
layout/tables/nsTableRowFrame.cpp
View File

@ -605,13 +605,13 @@ PRBool nsTableRowFrame::PullUpChildren(nsIPresContext* aPresContext,
// it's splittable then reflow it. The reason we can't just move
// it is that we still need ascent/descent information
nsSize kidFrameSize;
SplittableType kidIsSplittable;
nsSplittableType kidIsSplittable;
kidFrame->GetSize(kidFrameSize);
kidFrame->IsSplittable(kidIsSplittable);
if ((kidFrameSize.height > aState.availSize.height) &&
(kidIsSplittable == NotSplittable)) {
NS_FRAME_IS_NOT_SPLITTABLE(kidIsSplittable)) {
result = PR_FALSE;
mLastContentIsComplete = prevLastContentIsComplete;
break;

4
layout/tables/nsTableRowGroupFrame.cpp
View File

@ -520,12 +520,12 @@ PRBool nsTableRowGroupFrame::PullUpChildren(nsIPresContext* aPresContext,
// it's splittable then reflow it. The reason we can't just move
// it is that we still need ascent/descent information
nsSize kidFrameSize;
SplittableType kidIsSplittable;
nsSplittableType kidIsSplittable;
kidFrame->GetSize(kidFrameSize);
kidFrame->IsSplittable(kidIsSplittable);
if ((kidFrameSize.height > aState.availSize.height) &&
(kidIsSplittable == NotSplittable)) {
NS_FRAME_IS_NOT_SPLITTABLE(kidIsSplittable)) {
result = PR_FALSE;
mLastContentIsComplete = prevLastContentIsComplete;
break;