Split nsHTMLReflowMetrics into a separate file (nsHTMLReflowMetrics.h rather than nsIFrame.h). b=64023 r,sr in {waterson, attinasi}

This commit is contained in:
dbaron%fas.harvard.edu 2001-08-01 01:27:50 +00:00
Родитель 201729eaa5
Коммит 3d51f4ce1a
15 изменённых файлов: 315 добавлений и 260 удалений

Просмотреть файл

@ -3,6 +3,7 @@
#
nsFrameList.h
nsFrameTraversal.h
nsHTMLReflowMetrics.h
nsHTMLReflowState.h
nsIAutoCopy.h
nsICaret.h

Просмотреть файл

@ -31,6 +31,7 @@ XPIDL_MODULE = layout_base
EXPORTS = \
nslayout.h \
nsHTMLReflowMetrics.h \
nsHTMLReflowState.h \
nsIAutoCopy.h \
nsICaret.h \

Просмотреть файл

@ -24,6 +24,7 @@ include <$(DEPTH)\config\config.mak>
EXPORTS = \
nslayout.h \
nsHTMLReflowMetrics.h \
nsHTMLReflowState.h \
nsIAutoCopy.h \
nsICaret.h \

Просмотреть файл

@ -0,0 +1,142 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
*
* The contents of this file are subject to the Netscape Public
* License Version 1.1 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.mozilla.org/NPL/
*
* Software distributed under the License is distributed on an "AS
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
* implied. See the License for the specific language governing
* rights and limitations under the License.
*
* The Original Code is mozilla.org code.
*
* The Initial Developer of the Original Code is Netscape
* Communications Corporation. Portions created by Netscape are
* Copyright (C) 1998 Netscape Communications Corporation. All
* Rights Reserved.
*
* Contributor(s):
*/
#ifndef nsHTMLReflowMetrics_h___
#define nsHTMLReflowMetrics_h___
#include <stdio.h>
#include "nslayout.h"
#include "nsISupports.h"
#include "nsMargin.h"
#include "nsRect.h"
// for MOZ_MATHML
#include "nsIRenderingContext.h" //to get struct nsBoundingMetrics
struct nsSize;
//----------------------------------------------------------------------
// Option flags
#define NS_REFLOW_CALC_MAX_WIDTH 0x0001
#ifdef MOZ_MATHML
#define NS_REFLOW_CALC_BOUNDING_METRICS 0x0002
#endif
/**
* Reflow metrics used to return the frame's desired size and alignment
* information.
*
* @see #Reflow()
*/
struct nsHTMLReflowMetrics {
nscoord width, height; // [OUT] desired width and height
nscoord ascent, descent; // [OUT] ascent and descent information
// Set this to null if you don't need to compute the max element size
nsSize* maxElementSize; // [OUT]
// Used for incremental reflow. If the NS_REFLOW_CALC_MAX_WIDTH flag is set,
// then the caller is requesting that you update and return your maximum width
nscoord mMaximumWidth; // [OUT]
#ifdef MOZ_MATHML
// Metrics that _exactly_ enclose the text to allow precise MathML placements.
// If the NS_REFLOW_CALC_BOUNDING_METRICS flag is set, then the caller is
// requesting that you also compute additional details about your inner
// bounding box and italic correction. For example, the bounding box of
// msup is the smallest rectangle that _exactly_ encloses both the text
// of the base and the text of the superscript.
nsBoundingMetrics mBoundingMetrics; // [OUT]
#endif
// Carried out bottom margin values. This is the collapsed
// (generational) bottom margin value.
nscoord mCarriedOutBottomMargin;
// For frames that have content that overflow their content area
// (NS_FRAME_OUTSIDE_CHILDREN) this rectangle represents the total area
// of the frame including visible overflow, i.e., don't include overflowing
// content that is hidden.
// The rect is in the local coordinate space of the frame, and should be at
// least as big as the desired size. If there is no content that overflows,
// then the overflow area is identical to the desired size and should be
// {0, 0, mWidth, mHeight}.
nsRect mOverflowArea;
PRUint32 mFlags;
// used by tables to optimize common cases
PRBool mNothingChanged;
nsHTMLReflowMetrics(nsSize* aMaxElementSize, PRUint32 aFlags = 0) {
maxElementSize = aMaxElementSize;
mMaximumWidth = 0;
mFlags = aFlags;
mCarriedOutBottomMargin = 0;
mOverflowArea.x = 0;
mOverflowArea.y = 0;
mOverflowArea.width = 0;
mOverflowArea.height = 0;
mNothingChanged = PR_FALSE;
#ifdef MOZ_MATHML
mBoundingMetrics.Clear();
#endif
// XXX These are OUT parameters and so they shouldn't have to be
// initialized, but there are some bad frame classes that aren't
// properly setting them when returning from Reflow()...
width = height = 0;
ascent = descent = 0;
}
void AddBorderPaddingToMaxElementSize(const nsMargin& aBorderPadding) {
maxElementSize->width += aBorderPadding.left + aBorderPadding.right;
maxElementSize->height += aBorderPadding.top + aBorderPadding.bottom;
}
nsHTMLReflowMetrics& operator=(const nsHTMLReflowMetrics& aOther)
{
if (maxElementSize && aOther.maxElementSize) {
maxElementSize->width = aOther.maxElementSize->width;
maxElementSize->height = aOther.maxElementSize->height;
}
mMaximumWidth = aOther.mMaximumWidth;
mFlags = aOther.mFlags;
mCarriedOutBottomMargin = aOther.mCarriedOutBottomMargin;
mOverflowArea.x = aOther.mOverflowArea.x;
mOverflowArea.y = aOther.mOverflowArea.y;
mOverflowArea.width = aOther.mOverflowArea.width;
mOverflowArea.height = aOther.mOverflowArea.height;
mNothingChanged = aOther.mNothingChanged;
#ifdef MOZ_MATHML
mBoundingMetrics = aOther.mBoundingMetrics;
#endif
width = aOther.width;
height = aOther.height;
ascent = aOther.ascent;
descent = aOther.descent;
return *this;
}
};
#endif /* nsHTMLReflowMetrics_h___ */

Просмотреть файл

@ -27,16 +27,6 @@
#include "nsISupports.h"
#include "nsEvent.h"
#include "nsStyleStruct.h"
#include "nsSize.h"
#include "nsMargin.h"
#include "nsRect.h"
#ifdef MOZ_MATHML
#include "nsIRenderingContext.h" //to get struct nsBoundingMetrics
#endif
struct nsGUIEvent;
struct nsHTMLReflowState;
class nsIReflowCommand;
/**
* New rules of reflow:
@ -55,6 +45,10 @@ class nsIReflowCommand;
* 5. the view system handles moving of widgets, i.e., it's not our problem
*/
struct nsHTMLReflowState;
class nsIReflowCommand;
struct nsHTMLReflowMetrics;
class nsIAtom;
class nsIContent;
class nsIPresContext;
@ -64,23 +58,15 @@ class nsISizeOfHandler;
class nsIStyleContext;
class nsIView;
class nsIWidget;
class nsAutoString;
class nsString;
class nsIFocusTracker;
class nsStyleChangeList;
class nsBlockFrame;
class nsLineLayout;
class nsIDOMRange;
class nsISelectionController;
class nsIAccessible;
struct nsPeekOffsetStruct;
struct nsPoint;
struct nsRect;
struct nsStyleStruct;
class nsIDOMRange;
class nsICaret;
class nsISelectionController;
struct PRLogModuleInfo;
class nsIAccessible;
struct nsSize;
struct nsMargin;
// IID for the nsIFrame interface
// a6cf9050-15b3-11d2-932e-00805f8add32
@ -243,113 +229,6 @@ enum nsContextProviderRelationship {
eContextProvider_Descendant = 1
};
//----------------------------------------------------------------------
// Option flags
#define NS_REFLOW_CALC_MAX_WIDTH 0x0001
#ifdef MOZ_MATHML
#define NS_REFLOW_CALC_BOUNDING_METRICS 0x0002
#endif
/**
* Reflow metrics used to return the frame's desired size and alignment
* information.
*
* @see #Reflow()
*/
struct nsHTMLReflowMetrics {
nscoord width, height; // [OUT] desired width and height
nscoord ascent, descent; // [OUT] ascent and descent information
// Set this to null if you don't need to compute the max element size
nsSize* maxElementSize; // [OUT]
// Used for incremental reflow. If the NS_REFLOW_CALC_MAX_WIDTH flag is set,
// then the caller is requesting that you update and return your maximum width
nscoord mMaximumWidth; // [OUT]
#ifdef MOZ_MATHML
// Metrics that _exactly_ enclose the text to allow precise MathML placements.
// If the NS_REFLOW_CALC_BOUNDING_METRICS flag is set, then the caller is
// requesting that you also compute additional details about your inner
// bounding box and italic correction. For example, the bounding box of
// msup is the smallest rectangle that _exactly_ encloses both the text
// of the base and the text of the superscript.
nsBoundingMetrics mBoundingMetrics; // [OUT]
#endif
// Carried out bottom margin values. This is the collapsed
// (generational) bottom margin value.
nscoord mCarriedOutBottomMargin;
// For frames that have content that overflow their content area
// (NS_FRAME_OUTSIDE_CHILDREN) this rectangle represents the total area
// of the frame including visible overflow, i.e., don't include overflowing
// content that is hidden.
// The rect is in the local coordinate space of the frame, and should be at
// least as big as the desired size. If there is no content that overflows,
// then the overflow area is identical to the desired size and should be
// {0, 0, mWidth, mHeight}.
nsRect mOverflowArea;
PRUint32 mFlags;
// used by tables to optimize common cases
PRBool mNothingChanged;
nsHTMLReflowMetrics(nsSize* aMaxElementSize, PRUint32 aFlags = 0) {
maxElementSize = aMaxElementSize;
mMaximumWidth = 0;
mFlags = aFlags;
mCarriedOutBottomMargin = 0;
mOverflowArea.x = 0;
mOverflowArea.y = 0;
mOverflowArea.width = 0;
mOverflowArea.height = 0;
mNothingChanged = PR_FALSE;
#ifdef MOZ_MATHML
mBoundingMetrics.Clear();
#endif
// XXX These are OUT parameters and so they shouldn't have to be
// initialized, but there are some bad frame classes that aren't
// properly setting them when returning from Reflow()...
width = height = 0;
ascent = descent = 0;
}
void AddBorderPaddingToMaxElementSize(const nsMargin& aBorderPadding) {
maxElementSize->width += aBorderPadding.left + aBorderPadding.right;
maxElementSize->height += aBorderPadding.top + aBorderPadding.bottom;
}
nsHTMLReflowMetrics& operator=(const nsHTMLReflowMetrics& aOther)
{
if (maxElementSize && aOther.maxElementSize) {
maxElementSize->width = aOther.maxElementSize->width;
maxElementSize->height = aOther.maxElementSize->height;
}
mMaximumWidth = aOther.mMaximumWidth;
mFlags = aOther.mFlags;
mCarriedOutBottomMargin = aOther.mCarriedOutBottomMargin;
mOverflowArea.x = aOther.mOverflowArea.x;
mOverflowArea.y = aOther.mOverflowArea.y;
mOverflowArea.width = aOther.mOverflowArea.width;
mOverflowArea.height = aOther.mOverflowArea.height;
mNothingChanged = aOther.mNothingChanged;
#ifdef MOZ_MATHML
mBoundingMetrics = aOther.mBoundingMetrics;
#endif
width = aOther.width;
height = aOther.height;
ascent = aOther.ascent;
descent = aOther.descent;
return *this;
}
};
// Carried out margin flags
#define NS_CARRIED_TOP_MARGIN_IS_AUTO 0x1
#define NS_CARRIED_BOTTOM_MARGIN_IS_AUTO 0x2

Просмотреть файл

@ -27,6 +27,7 @@
class nsIFrame;
class nsIPresContext;
struct PRLogModuleInfo;
// IID for the nsIFrameDebug interface {a6cf9069-15b3-11d2-932e-00805f8add32}
#define NS_IFRAMEDEBUG_IID \

Просмотреть файл

@ -24,6 +24,7 @@
#include "nsIFrame.h"
#include "nsHTMLReflowState.h"
#include "nsHTMLReflowMetrics.h"
class nsBlockFrame;
class nsIFrame;

Просмотреть файл

@ -29,6 +29,8 @@
#include "nsBlockBandData.h"
#include "nsLineBox.h"
class nsBlockFrame;
class nsBlockReflowState {
public:
nsBlockReflowState(const nsHTMLReflowState& aReflowState,

Просмотреть файл

@ -35,6 +35,7 @@
#include "nsIReflowCommand.h"
#include "nsIFrameSelection.h"
#include "nsHTMLReflowState.h"
#include "nsHTMLReflowMetrics.h"
/**
* nsFrame logging constants. We redefine the nspr

Просмотреть файл

@ -0,0 +1,142 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
*
* The contents of this file are subject to the Netscape Public
* License Version 1.1 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.mozilla.org/NPL/
*
* Software distributed under the License is distributed on an "AS
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
* implied. See the License for the specific language governing
* rights and limitations under the License.
*
* The Original Code is mozilla.org code.
*
* The Initial Developer of the Original Code is Netscape
* Communications Corporation. Portions created by Netscape are
* Copyright (C) 1998 Netscape Communications Corporation. All
* Rights Reserved.
*
* Contributor(s):
*/
#ifndef nsHTMLReflowMetrics_h___
#define nsHTMLReflowMetrics_h___
#include <stdio.h>
#include "nslayout.h"
#include "nsISupports.h"
#include "nsMargin.h"
#include "nsRect.h"
// for MOZ_MATHML
#include "nsIRenderingContext.h" //to get struct nsBoundingMetrics
struct nsSize;
//----------------------------------------------------------------------
// Option flags
#define NS_REFLOW_CALC_MAX_WIDTH 0x0001
#ifdef MOZ_MATHML
#define NS_REFLOW_CALC_BOUNDING_METRICS 0x0002
#endif
/**
* Reflow metrics used to return the frame's desired size and alignment
* information.
*
* @see #Reflow()
*/
struct nsHTMLReflowMetrics {
nscoord width, height; // [OUT] desired width and height
nscoord ascent, descent; // [OUT] ascent and descent information
// Set this to null if you don't need to compute the max element size
nsSize* maxElementSize; // [OUT]
// Used for incremental reflow. If the NS_REFLOW_CALC_MAX_WIDTH flag is set,
// then the caller is requesting that you update and return your maximum width
nscoord mMaximumWidth; // [OUT]
#ifdef MOZ_MATHML
// Metrics that _exactly_ enclose the text to allow precise MathML placements.
// If the NS_REFLOW_CALC_BOUNDING_METRICS flag is set, then the caller is
// requesting that you also compute additional details about your inner
// bounding box and italic correction. For example, the bounding box of
// msup is the smallest rectangle that _exactly_ encloses both the text
// of the base and the text of the superscript.
nsBoundingMetrics mBoundingMetrics; // [OUT]
#endif
// Carried out bottom margin values. This is the collapsed
// (generational) bottom margin value.
nscoord mCarriedOutBottomMargin;
// For frames that have content that overflow their content area
// (NS_FRAME_OUTSIDE_CHILDREN) this rectangle represents the total area
// of the frame including visible overflow, i.e., don't include overflowing
// content that is hidden.
// The rect is in the local coordinate space of the frame, and should be at
// least as big as the desired size. If there is no content that overflows,
// then the overflow area is identical to the desired size and should be
// {0, 0, mWidth, mHeight}.
nsRect mOverflowArea;
PRUint32 mFlags;
// used by tables to optimize common cases
PRBool mNothingChanged;
nsHTMLReflowMetrics(nsSize* aMaxElementSize, PRUint32 aFlags = 0) {
maxElementSize = aMaxElementSize;
mMaximumWidth = 0;
mFlags = aFlags;
mCarriedOutBottomMargin = 0;
mOverflowArea.x = 0;
mOverflowArea.y = 0;
mOverflowArea.width = 0;
mOverflowArea.height = 0;
mNothingChanged = PR_FALSE;
#ifdef MOZ_MATHML
mBoundingMetrics.Clear();
#endif
// XXX These are OUT parameters and so they shouldn't have to be
// initialized, but there are some bad frame classes that aren't
// properly setting them when returning from Reflow()...
width = height = 0;
ascent = descent = 0;
}
void AddBorderPaddingToMaxElementSize(const nsMargin& aBorderPadding) {
maxElementSize->width += aBorderPadding.left + aBorderPadding.right;
maxElementSize->height += aBorderPadding.top + aBorderPadding.bottom;
}
nsHTMLReflowMetrics& operator=(const nsHTMLReflowMetrics& aOther)
{
if (maxElementSize && aOther.maxElementSize) {
maxElementSize->width = aOther.maxElementSize->width;
maxElementSize->height = aOther.maxElementSize->height;
}
mMaximumWidth = aOther.mMaximumWidth;
mFlags = aOther.mFlags;
mCarriedOutBottomMargin = aOther.mCarriedOutBottomMargin;
mOverflowArea.x = aOther.mOverflowArea.x;
mOverflowArea.y = aOther.mOverflowArea.y;
mOverflowArea.width = aOther.mOverflowArea.width;
mOverflowArea.height = aOther.mOverflowArea.height;
mNothingChanged = aOther.mNothingChanged;
#ifdef MOZ_MATHML
mBoundingMetrics = aOther.mBoundingMetrics;
#endif
width = aOther.width;
height = aOther.height;
ascent = aOther.ascent;
descent = aOther.descent;
return *this;
}
};
#endif /* nsHTMLReflowMetrics_h___ */

Просмотреть файл

@ -27,16 +27,6 @@
#include "nsISupports.h"
#include "nsEvent.h"
#include "nsStyleStruct.h"
#include "nsSize.h"
#include "nsMargin.h"
#include "nsRect.h"
#ifdef MOZ_MATHML
#include "nsIRenderingContext.h" //to get struct nsBoundingMetrics
#endif
struct nsGUIEvent;
struct nsHTMLReflowState;
class nsIReflowCommand;
/**
* New rules of reflow:
@ -55,6 +45,10 @@ class nsIReflowCommand;
* 5. the view system handles moving of widgets, i.e., it's not our problem
*/
struct nsHTMLReflowState;
class nsIReflowCommand;
struct nsHTMLReflowMetrics;
class nsIAtom;
class nsIContent;
class nsIPresContext;
@ -64,23 +58,15 @@ class nsISizeOfHandler;
class nsIStyleContext;
class nsIView;
class nsIWidget;
class nsAutoString;
class nsString;
class nsIFocusTracker;
class nsStyleChangeList;
class nsBlockFrame;
class nsLineLayout;
class nsIDOMRange;
class nsISelectionController;
class nsIAccessible;
struct nsPeekOffsetStruct;
struct nsPoint;
struct nsRect;
struct nsStyleStruct;
class nsIDOMRange;
class nsICaret;
class nsISelectionController;
struct PRLogModuleInfo;
class nsIAccessible;
struct nsSize;
struct nsMargin;
// IID for the nsIFrame interface
// a6cf9050-15b3-11d2-932e-00805f8add32
@ -243,113 +229,6 @@ enum nsContextProviderRelationship {
eContextProvider_Descendant = 1
};
//----------------------------------------------------------------------
// Option flags
#define NS_REFLOW_CALC_MAX_WIDTH 0x0001
#ifdef MOZ_MATHML
#define NS_REFLOW_CALC_BOUNDING_METRICS 0x0002
#endif
/**
* Reflow metrics used to return the frame's desired size and alignment
* information.
*
* @see #Reflow()
*/
struct nsHTMLReflowMetrics {
nscoord width, height; // [OUT] desired width and height
nscoord ascent, descent; // [OUT] ascent and descent information
// Set this to null if you don't need to compute the max element size
nsSize* maxElementSize; // [OUT]
// Used for incremental reflow. If the NS_REFLOW_CALC_MAX_WIDTH flag is set,
// then the caller is requesting that you update and return your maximum width
nscoord mMaximumWidth; // [OUT]
#ifdef MOZ_MATHML
// Metrics that _exactly_ enclose the text to allow precise MathML placements.
// If the NS_REFLOW_CALC_BOUNDING_METRICS flag is set, then the caller is
// requesting that you also compute additional details about your inner
// bounding box and italic correction. For example, the bounding box of
// msup is the smallest rectangle that _exactly_ encloses both the text
// of the base and the text of the superscript.
nsBoundingMetrics mBoundingMetrics; // [OUT]
#endif
// Carried out bottom margin values. This is the collapsed
// (generational) bottom margin value.
nscoord mCarriedOutBottomMargin;
// For frames that have content that overflow their content area
// (NS_FRAME_OUTSIDE_CHILDREN) this rectangle represents the total area
// of the frame including visible overflow, i.e., don't include overflowing
// content that is hidden.
// The rect is in the local coordinate space of the frame, and should be at
// least as big as the desired size. If there is no content that overflows,
// then the overflow area is identical to the desired size and should be
// {0, 0, mWidth, mHeight}.
nsRect mOverflowArea;
PRUint32 mFlags;
// used by tables to optimize common cases
PRBool mNothingChanged;
nsHTMLReflowMetrics(nsSize* aMaxElementSize, PRUint32 aFlags = 0) {
maxElementSize = aMaxElementSize;
mMaximumWidth = 0;
mFlags = aFlags;
mCarriedOutBottomMargin = 0;
mOverflowArea.x = 0;
mOverflowArea.y = 0;
mOverflowArea.width = 0;
mOverflowArea.height = 0;
mNothingChanged = PR_FALSE;
#ifdef MOZ_MATHML
mBoundingMetrics.Clear();
#endif
// XXX These are OUT parameters and so they shouldn't have to be
// initialized, but there are some bad frame classes that aren't
// properly setting them when returning from Reflow()...
width = height = 0;
ascent = descent = 0;
}
void AddBorderPaddingToMaxElementSize(const nsMargin& aBorderPadding) {
maxElementSize->width += aBorderPadding.left + aBorderPadding.right;
maxElementSize->height += aBorderPadding.top + aBorderPadding.bottom;
}
nsHTMLReflowMetrics& operator=(const nsHTMLReflowMetrics& aOther)
{
if (maxElementSize && aOther.maxElementSize) {
maxElementSize->width = aOther.maxElementSize->width;
maxElementSize->height = aOther.maxElementSize->height;
}
mMaximumWidth = aOther.mMaximumWidth;
mFlags = aOther.mFlags;
mCarriedOutBottomMargin = aOther.mCarriedOutBottomMargin;
mOverflowArea.x = aOther.mOverflowArea.x;
mOverflowArea.y = aOther.mOverflowArea.y;
mOverflowArea.width = aOther.mOverflowArea.width;
mOverflowArea.height = aOther.mOverflowArea.height;
mNothingChanged = aOther.mNothingChanged;
#ifdef MOZ_MATHML
mBoundingMetrics = aOther.mBoundingMetrics;
#endif
width = aOther.width;
height = aOther.height;
ascent = aOther.ascent;
descent = aOther.descent;
return *this;
}
};
// Carried out margin flags
#define NS_CARRIED_TOP_MARGIN_IS_AUTO 0x1
#define NS_CARRIED_BOTTOM_MARGIN_IS_AUTO 0x2

Просмотреть файл

@ -27,6 +27,7 @@
class nsIFrame;
class nsIPresContext;
struct PRLogModuleInfo;
// IID for the nsIFrameDebug interface {a6cf9069-15b3-11d2-932e-00805f8add32}
#define NS_IFRAMEDEBUG_IID \

Просмотреть файл

@ -24,6 +24,7 @@
#include "nsIFrame.h"
#include "nsHTMLReflowState.h"
#include "nsHTMLReflowMetrics.h"
class nsBlockFrame;
class nsIFrame;

Просмотреть файл

@ -29,6 +29,8 @@
#include "nsBlockBandData.h"
#include "nsLineBox.h"
class nsBlockFrame;
class nsBlockReflowState {
public:
nsBlockReflowState(const nsHTMLReflowState& aReflowState,

Просмотреть файл

@ -35,6 +35,7 @@
#include "nsIReflowCommand.h"
#include "nsIFrameSelection.h"
#include "nsHTMLReflowState.h"
#include "nsHTMLReflowMetrics.h"
/**
* nsFrame logging constants. We redefine the nspr