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

Added ASSERTION and run-time check for SpaceManager before dereferencing it. r=rods,pierre

Browse Source
This commit is contained in:
attinasi@netscape.com
2000-01-18 15:36:36 +00:00
parent e99ccbb14c
commit d9e7126009
6 changed files with 54 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
layout/generic/nsBlockFrame.cpp
View File

@@ -580,6 +580,8 @@ nsBlockReflowState::nsBlockReflowState(const nsHTMLReflowState& aReflowState,
mLineNumber(0), mLineNumber(0),
mNeedResizeReflow(PR_FALSE) mNeedResizeReflow(PR_FALSE)
{ {
const nsMargin& borderPadding = BorderPadding();
if (aBlockMarginRoot) { if (aBlockMarginRoot) {
mIsTopMarginRoot = PR_TRUE; mIsTopMarginRoot = PR_TRUE;
mIsBottomMarginRoot = PR_TRUE; mIsBottomMarginRoot = PR_TRUE;
@@ -596,11 +598,13 @@ nsBlockReflowState::nsBlockReflowState(const nsHTMLReflowState& aReflowState,
mSpaceManager = aReflowState.mSpaceManager; mSpaceManager = aReflowState.mSpaceManager;
NS_ASSERTION( nsnull != mSpaceManager, "SpaceManager should be set in nsBlockReflowState" );
if( nsnull != mSpaceManager ) {
// Translate into our content area and then save the // Translate into our content area and then save the
// coordinate system origin for later. // coordinate system origin for later.
const nsMargin& borderPadding = BorderPadding();
mSpaceManager->Translate(borderPadding.left, borderPadding.top); mSpaceManager->Translate(borderPadding.left, borderPadding.top);
mSpaceManager->GetTranslation(mSpaceManagerX, mSpaceManagerY); mSpaceManager->GetTranslation(mSpaceManagerX, mSpaceManagerY);
}
mReflowStatus = NS_FRAME_COMPLETE; mReflowStatus = NS_FRAME_COMPLETE;

6
layout/generic/nsBlockReflowState.cpp
View File

@@ -580,6 +580,8 @@ nsBlockReflowState::nsBlockReflowState(const nsHTMLReflowState& aReflowState,
mLineNumber(0), mLineNumber(0),
mNeedResizeReflow(PR_FALSE) mNeedResizeReflow(PR_FALSE)
{ {
const nsMargin& borderPadding = BorderPadding();
if (aBlockMarginRoot) { if (aBlockMarginRoot) {
mIsTopMarginRoot = PR_TRUE; mIsTopMarginRoot = PR_TRUE;
mIsBottomMarginRoot = PR_TRUE; mIsBottomMarginRoot = PR_TRUE;
@@ -596,11 +598,13 @@ nsBlockReflowState::nsBlockReflowState(const nsHTMLReflowState& aReflowState,
mSpaceManager = aReflowState.mSpaceManager; mSpaceManager = aReflowState.mSpaceManager;
NS_ASSERTION( nsnull != mSpaceManager, "SpaceManager should be set in nsBlockReflowState" );
if( nsnull != mSpaceManager ) {
// Translate into our content area and then save the // Translate into our content area and then save the
// coordinate system origin for later. // coordinate system origin for later.
const nsMargin& borderPadding = BorderPadding();
mSpaceManager->Translate(borderPadding.left, borderPadding.top); mSpaceManager->Translate(borderPadding.left, borderPadding.top);
mSpaceManager->GetTranslation(mSpaceManagerX, mSpaceManagerY); mSpaceManager->GetTranslation(mSpaceManagerX, mSpaceManagerY);
}
mReflowStatus = NS_FRAME_COMPLETE; mReflowStatus = NS_FRAME_COMPLETE;

6
layout/generic/nsBlockReflowState.h
View File

@@ -580,6 +580,8 @@ nsBlockReflowState::nsBlockReflowState(const nsHTMLReflowState& aReflowState,
mLineNumber(0), mLineNumber(0),
mNeedResizeReflow(PR_FALSE) mNeedResizeReflow(PR_FALSE)
{ {
const nsMargin& borderPadding = BorderPadding();
if (aBlockMarginRoot) { if (aBlockMarginRoot) {
mIsTopMarginRoot = PR_TRUE; mIsTopMarginRoot = PR_TRUE;
mIsBottomMarginRoot = PR_TRUE; mIsBottomMarginRoot = PR_TRUE;
@@ -596,11 +598,13 @@ nsBlockReflowState::nsBlockReflowState(const nsHTMLReflowState& aReflowState,
mSpaceManager = aReflowState.mSpaceManager; mSpaceManager = aReflowState.mSpaceManager;
NS_ASSERTION( nsnull != mSpaceManager, "SpaceManager should be set in nsBlockReflowState" );
if( nsnull != mSpaceManager ) {
// Translate into our content area and then save the // Translate into our content area and then save the
// coordinate system origin for later. // coordinate system origin for later.
const nsMargin& borderPadding = BorderPadding();
mSpaceManager->Translate(borderPadding.left, borderPadding.top); mSpaceManager->Translate(borderPadding.left, borderPadding.top);
mSpaceManager->GetTranslation(mSpaceManagerX, mSpaceManagerY); mSpaceManager->GetTranslation(mSpaceManagerX, mSpaceManagerY);
}
mReflowStatus = NS_FRAME_COMPLETE; mReflowStatus = NS_FRAME_COMPLETE;

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

@@ -580,6 +580,8 @@ nsBlockReflowState::nsBlockReflowState(const nsHTMLReflowState& aReflowState,
mLineNumber(0), mLineNumber(0),
mNeedResizeReflow(PR_FALSE) mNeedResizeReflow(PR_FALSE)
{ {
const nsMargin& borderPadding = BorderPadding();
if (aBlockMarginRoot) { if (aBlockMarginRoot) {
mIsTopMarginRoot = PR_TRUE; mIsTopMarginRoot = PR_TRUE;
mIsBottomMarginRoot = PR_TRUE; mIsBottomMarginRoot = PR_TRUE;
@@ -596,11 +598,13 @@ nsBlockReflowState::nsBlockReflowState(const nsHTMLReflowState& aReflowState,
mSpaceManager = aReflowState.mSpaceManager; mSpaceManager = aReflowState.mSpaceManager;
NS_ASSERTION( nsnull != mSpaceManager, "SpaceManager should be set in nsBlockReflowState" );
if( nsnull != mSpaceManager ) {
// Translate into our content area and then save the // Translate into our content area and then save the
// coordinate system origin for later. // coordinate system origin for later.
const nsMargin& borderPadding = BorderPadding();
mSpaceManager->Translate(borderPadding.left, borderPadding.top); mSpaceManager->Translate(borderPadding.left, borderPadding.top);
mSpaceManager->GetTranslation(mSpaceManagerX, mSpaceManagerY); mSpaceManager->GetTranslation(mSpaceManagerX, mSpaceManagerY);
}
mReflowStatus = NS_FRAME_COMPLETE; mReflowStatus = NS_FRAME_COMPLETE;

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

@@ -580,6 +580,8 @@ nsBlockReflowState::nsBlockReflowState(const nsHTMLReflowState& aReflowState,
mLineNumber(0), mLineNumber(0),
mNeedResizeReflow(PR_FALSE) mNeedResizeReflow(PR_FALSE)
{ {
const nsMargin& borderPadding = BorderPadding();
if (aBlockMarginRoot) { if (aBlockMarginRoot) {
mIsTopMarginRoot = PR_TRUE; mIsTopMarginRoot = PR_TRUE;
mIsBottomMarginRoot = PR_TRUE; mIsBottomMarginRoot = PR_TRUE;
@@ -596,11 +598,13 @@ nsBlockReflowState::nsBlockReflowState(const nsHTMLReflowState& aReflowState,
mSpaceManager = aReflowState.mSpaceManager; mSpaceManager = aReflowState.mSpaceManager;
NS_ASSERTION( nsnull != mSpaceManager, "SpaceManager should be set in nsBlockReflowState" );
if( nsnull != mSpaceManager ) {
// Translate into our content area and then save the // Translate into our content area and then save the
// coordinate system origin for later. // coordinate system origin for later.
const nsMargin& borderPadding = BorderPadding();
mSpaceManager->Translate(borderPadding.left, borderPadding.top); mSpaceManager->Translate(borderPadding.left, borderPadding.top);
mSpaceManager->GetTranslation(mSpaceManagerX, mSpaceManagerY); mSpaceManager->GetTranslation(mSpaceManagerX, mSpaceManagerY);
}
mReflowStatus = NS_FRAME_COMPLETE; mReflowStatus = NS_FRAME_COMPLETE;

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

@@ -580,6 +580,8 @@ nsBlockReflowState::nsBlockReflowState(const nsHTMLReflowState& aReflowState,
mLineNumber(0), mLineNumber(0),
mNeedResizeReflow(PR_FALSE) mNeedResizeReflow(PR_FALSE)
{ {
const nsMargin& borderPadding = BorderPadding();
if (aBlockMarginRoot) { if (aBlockMarginRoot) {
mIsTopMarginRoot = PR_TRUE; mIsTopMarginRoot = PR_TRUE;
mIsBottomMarginRoot = PR_TRUE; mIsBottomMarginRoot = PR_TRUE;
@@ -596,11 +598,13 @@ nsBlockReflowState::nsBlockReflowState(const nsHTMLReflowState& aReflowState,
mSpaceManager = aReflowState.mSpaceManager; mSpaceManager = aReflowState.mSpaceManager;
NS_ASSERTION( nsnull != mSpaceManager, "SpaceManager should be set in nsBlockReflowState" );
if( nsnull != mSpaceManager ) {
// Translate into our content area and then save the // Translate into our content area and then save the
// coordinate system origin for later. // coordinate system origin for later.
const nsMargin& borderPadding = BorderPadding();
mSpaceManager->Translate(borderPadding.left, borderPadding.top); mSpaceManager->Translate(borderPadding.left, borderPadding.top);
mSpaceManager->GetTranslation(mSpaceManagerX, mSpaceManagerY); mSpaceManager->GetTranslation(mSpaceManagerX, mSpaceManagerY);
}
mReflowStatus = NS_FRAME_COMPLETE; mReflowStatus = NS_FRAME_COMPLETE;