From be4ed98aae5f93617ee935c25d84136015229efc Mon Sep 17 00:00:00 2001 From: kipp Date: Sat, 30 May 1998 21:18:32 +0000 Subject: [PATCH] Use new cssLayout api git-svn-id: svn://10.0.0.236/trunk@2753 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsBlockFrame.cpp | 3 ++- mozilla/layout/generic/nsBlockReflowState.cpp | 3 ++- mozilla/layout/generic/nsBlockReflowState.h | 3 ++- mozilla/layout/html/base/src/nsBlockFrame.cpp | 3 ++- mozilla/layout/html/base/src/nsBlockReflowState.cpp | 3 ++- mozilla/layout/html/base/src/nsBlockReflowState.h | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp index 6cbf4674e8b..9429c9a24e6 100644 --- a/mozilla/layout/generic/nsBlockFrame.cpp +++ b/mozilla/layout/generic/nsBlockFrame.cpp @@ -1111,7 +1111,8 @@ nsBlockFrame::InitializeState(nsIPresContext* aPresContext, // Get and apply the stylistic size. Note: do not limit the // height until we are done reflowing. PRIntn ss = aState.mStyleSizeFlags = - nsCSSLayout::GetStyleSize(aPresContext, this, aState.mStyleSize); + nsCSSLayout::GetStyleSize(aPresContext, aReflowState, + aState.mStyleSize); if (0 != (ss & NS_SIZE_HAS_WIDTH)) { aState.mAvailSize.width = aState.mStyleSize.width + lr; } diff --git a/mozilla/layout/generic/nsBlockReflowState.cpp b/mozilla/layout/generic/nsBlockReflowState.cpp index 6cbf4674e8b..9429c9a24e6 100644 --- a/mozilla/layout/generic/nsBlockReflowState.cpp +++ b/mozilla/layout/generic/nsBlockReflowState.cpp @@ -1111,7 +1111,8 @@ nsBlockFrame::InitializeState(nsIPresContext* aPresContext, // Get and apply the stylistic size. Note: do not limit the // height until we are done reflowing. PRIntn ss = aState.mStyleSizeFlags = - nsCSSLayout::GetStyleSize(aPresContext, this, aState.mStyleSize); + nsCSSLayout::GetStyleSize(aPresContext, aReflowState, + aState.mStyleSize); if (0 != (ss & NS_SIZE_HAS_WIDTH)) { aState.mAvailSize.width = aState.mStyleSize.width + lr; } diff --git a/mozilla/layout/generic/nsBlockReflowState.h b/mozilla/layout/generic/nsBlockReflowState.h index 6cbf4674e8b..9429c9a24e6 100644 --- a/mozilla/layout/generic/nsBlockReflowState.h +++ b/mozilla/layout/generic/nsBlockReflowState.h @@ -1111,7 +1111,8 @@ nsBlockFrame::InitializeState(nsIPresContext* aPresContext, // Get and apply the stylistic size. Note: do not limit the // height until we are done reflowing. PRIntn ss = aState.mStyleSizeFlags = - nsCSSLayout::GetStyleSize(aPresContext, this, aState.mStyleSize); + nsCSSLayout::GetStyleSize(aPresContext, aReflowState, + aState.mStyleSize); if (0 != (ss & NS_SIZE_HAS_WIDTH)) { aState.mAvailSize.width = aState.mStyleSize.width + lr; } diff --git a/mozilla/layout/html/base/src/nsBlockFrame.cpp b/mozilla/layout/html/base/src/nsBlockFrame.cpp index 6cbf4674e8b..9429c9a24e6 100644 --- a/mozilla/layout/html/base/src/nsBlockFrame.cpp +++ b/mozilla/layout/html/base/src/nsBlockFrame.cpp @@ -1111,7 +1111,8 @@ nsBlockFrame::InitializeState(nsIPresContext* aPresContext, // Get and apply the stylistic size. Note: do not limit the // height until we are done reflowing. PRIntn ss = aState.mStyleSizeFlags = - nsCSSLayout::GetStyleSize(aPresContext, this, aState.mStyleSize); + nsCSSLayout::GetStyleSize(aPresContext, aReflowState, + aState.mStyleSize); if (0 != (ss & NS_SIZE_HAS_WIDTH)) { aState.mAvailSize.width = aState.mStyleSize.width + lr; } diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.cpp b/mozilla/layout/html/base/src/nsBlockReflowState.cpp index 6cbf4674e8b..9429c9a24e6 100644 --- a/mozilla/layout/html/base/src/nsBlockReflowState.cpp +++ b/mozilla/layout/html/base/src/nsBlockReflowState.cpp @@ -1111,7 +1111,8 @@ nsBlockFrame::InitializeState(nsIPresContext* aPresContext, // Get and apply the stylistic size. Note: do not limit the // height until we are done reflowing. PRIntn ss = aState.mStyleSizeFlags = - nsCSSLayout::GetStyleSize(aPresContext, this, aState.mStyleSize); + nsCSSLayout::GetStyleSize(aPresContext, aReflowState, + aState.mStyleSize); if (0 != (ss & NS_SIZE_HAS_WIDTH)) { aState.mAvailSize.width = aState.mStyleSize.width + lr; } diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.h b/mozilla/layout/html/base/src/nsBlockReflowState.h index 6cbf4674e8b..9429c9a24e6 100644 --- a/mozilla/layout/html/base/src/nsBlockReflowState.h +++ b/mozilla/layout/html/base/src/nsBlockReflowState.h @@ -1111,7 +1111,8 @@ nsBlockFrame::InitializeState(nsIPresContext* aPresContext, // Get and apply the stylistic size. Note: do not limit the // height until we are done reflowing. PRIntn ss = aState.mStyleSizeFlags = - nsCSSLayout::GetStyleSize(aPresContext, this, aState.mStyleSize); + nsCSSLayout::GetStyleSize(aPresContext, aReflowState, + aState.mStyleSize); if (0 != (ss & NS_SIZE_HAS_WIDTH)) { aState.mAvailSize.width = aState.mStyleSize.width + lr; }