wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

bug 1031241 pt 3 - Also rename Intrinsic{Width,Height} to Intrinsic{I,B}Size. r=smontagu

Browse Source
This commit is contained in:
Jonathan Kew 2014-07-24 18:03:26 +01:00
parent 62b1d1257b
commit 136de998f8
67 changed files with 211 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
layout/base/nsLayoutUtils.cpp
View File

@ -3568,7 +3568,7 @@ nsLayoutUtils::IsViewportScrollbarFrame(nsIFrame* aFrame)
IsProperAncestorFrame(rootScrolledFrame, aFrame));
}
static nscoord AddPercents(nsLayoutUtils::IntrinsicWidthType aType,
static nscoord AddPercents(nsLayoutUtils::IntrinsicISizeType aType,
nscoord aCurrent, float aPercent)
{
nscoord result = aCurrent;
@ -3755,7 +3755,7 @@ static int32_t gNoiseIndent = 0;
/* static */ nscoord
nsLayoutUtils::IntrinsicForContainer(nsRenderingContext *aRenderingContext,
nsIFrame *aFrame,
IntrinsicWidthType aType,
IntrinsicISizeType aType,
uint32_t aFlags)
{
NS_PRECONDITION(aFrame, "null frame");
@ -3772,8 +3772,8 @@ nsLayoutUtils::IntrinsicForContainer(nsRenderingContext *aRenderingContext,
// wrapping inside of it should not apply font size inflation.
AutoMaybeDisableFontInflation an(aFrame);
nsIFrame::IntrinsicWidthOffsetData offsets =
aFrame->IntrinsicWidthOffsets(aRenderingContext);
nsIFrame::IntrinsicISizeOffsetData offsets =
aFrame->IntrinsicISizeOffsets(aRenderingContext);
const nsStylePosition *stylePos = aFrame->StylePosition();
uint8_t boxSizing = stylePos->mBoxSizing;
@ -4163,7 +4163,7 @@ nsLayoutUtils::MarkDescendantsDirty(nsIFrame *aSubtreeRoot)
nsIFrame *f = stack.ElementAt(stack.Length() - 1);
stack.RemoveElementAt(stack.Length() - 1);
f->MarkIntrinsicWidthsDirty();
f->MarkIntrinsicISizesDirty();
if (f->GetType() == nsGkAtoms::placeholderFrame) {
nsIFrame *oof = nsPlaceholderFrame::GetRealFrameForPlaceholder(f);
@ -4318,31 +4318,31 @@ nsLayoutUtils::ComputeSizeWithIntrinsicDimensions(
NS_ASSERTION(aCBSize.width != NS_UNCONSTRAINEDSIZE,
"Our containing block must not have unconstrained width!");
bool hasIntrinsicWidth, hasIntrinsicHeight;
nscoord intrinsicWidth, intrinsicHeight;
bool hasIntrinsicISize, hasIntrinsicBSize;
nscoord intrinsicISize, intrinsicBSize;
if (aIntrinsicSize.width.GetUnit() == eStyleUnit_Coord) {
hasIntrinsicWidth = true;
intrinsicWidth = aIntrinsicSize.width.GetCoordValue();
if (intrinsicWidth < 0)
intrinsicWidth = 0;
hasIntrinsicISize = true;
intrinsicISize = aIntrinsicSize.width.GetCoordValue();
if (intrinsicISize < 0)
intrinsicISize = 0;
} else {
NS_ASSERTION(aIntrinsicSize.width.GetUnit() == eStyleUnit_None,
"unexpected unit");
hasIntrinsicWidth = false;
intrinsicWidth = 0;
hasIntrinsicISize = false;
intrinsicISize = 0;
}
if (aIntrinsicSize.height.GetUnit() == eStyleUnit_Coord) {
hasIntrinsicHeight = true;
intrinsicHeight = aIntrinsicSize.height.GetCoordValue();
if (intrinsicHeight < 0)
intrinsicHeight = 0;
hasIntrinsicBSize = true;
intrinsicBSize = aIntrinsicSize.height.GetCoordValue();
if (intrinsicBSize < 0)
intrinsicBSize = 0;
} else {
NS_ASSERTION(aIntrinsicSize.height.GetUnit() == eStyleUnit_None,
"unexpected unit");
hasIntrinsicHeight = false;
intrinsicHeight = 0;
hasIntrinsicBSize = false;
intrinsicBSize = 0;
}
NS_ASSERTION(aIntrinsicRatio.width >= 0 && aIntrinsicRatio.height >= 0,
@ -4359,10 +4359,10 @@ nsLayoutUtils::ComputeSizeWithIntrinsicDimensions(
nscoord tentWidth, tentHeight;
if (hasIntrinsicWidth) {
tentWidth = intrinsicWidth;
} else if (hasIntrinsicHeight && aIntrinsicRatio.height > 0) {
tentWidth = MULDIV(intrinsicHeight, aIntrinsicRatio.width, aIntrinsicRatio.height);
if (hasIntrinsicISize) {
tentWidth = intrinsicISize;
} else if (hasIntrinsicBSize && aIntrinsicRatio.height > 0) {
tentWidth = MULDIV(intrinsicBSize, aIntrinsicRatio.width, aIntrinsicRatio.height);
} else if (aIntrinsicRatio.width > 0) {
tentWidth = aCBSize.width - boxSizingToMarginEdgeWidth; // XXX scrollbar?
if (tentWidth < 0) tentWidth = 0;
@ -4370,8 +4370,8 @@ nsLayoutUtils::ComputeSizeWithIntrinsicDimensions(
tentWidth = nsPresContext::CSSPixelsToAppUnits(300);
}
if (hasIntrinsicHeight) {
tentHeight = intrinsicHeight;
if (hasIntrinsicBSize) {
tentHeight = intrinsicBSize;
} else if (aIntrinsicRatio.width > 0) {
tentHeight = MULDIV(tentWidth, aIntrinsicRatio.height, aIntrinsicRatio.width);
} else {
@ -4387,8 +4387,8 @@ nsLayoutUtils::ComputeSizeWithIntrinsicDimensions(
height = NS_CSS_MINMAX(height, minHeight, maxHeight);
if (aIntrinsicRatio.height > 0) {
width = MULDIV(height, aIntrinsicRatio.width, aIntrinsicRatio.height);
} else if (hasIntrinsicWidth) {
width = intrinsicWidth;
} else if (hasIntrinsicISize) {
width = intrinsicISize;
} else {
width = nsPresContext::CSSPixelsToAppUnits(300);
}
@ -4402,8 +4402,8 @@ nsLayoutUtils::ComputeSizeWithIntrinsicDimensions(
width = NS_CSS_MINMAX(width, minWidth, maxWidth);
if (aIntrinsicRatio.width > 0) {
height = MULDIV(width, aIntrinsicRatio.height, aIntrinsicRatio.width);
} else if (hasIntrinsicHeight) {
height = intrinsicHeight;
} else if (hasIntrinsicBSize) {
height = intrinsicBSize;
} else {
height = nsPresContext::CSSPixelsToAppUnits(150);
}

4
layout/base/nsLayoutUtils.h
View File

@ -1170,13 +1170,13 @@ public:
* 'min-width', and 'max-width' properties, and its padding, border,
* and margin.
*/
enum IntrinsicWidthType { MIN_WIDTH, PREF_WIDTH };
enum IntrinsicISizeType { MIN_WIDTH, PREF_WIDTH };
enum {
IGNORE_PADDING = 0x01
};
static nscoord IntrinsicForContainer(nsRenderingContext* aRenderingContext,
nsIFrame* aFrame,
IntrinsicWidthType aType,
IntrinsicISizeType aType,
uint32_t aFlags = 0);
/*

4
layout/base/nsPresShell.cpp
View File

@ -2836,7 +2836,7 @@ PresShell::FrameNeedsReflow(nsIFrame *aFrame, IntrinsicDirty aIntrinsicDirty,
for (nsIFrame *a = subtreeRoot;
a && !FRAME_IS_REFLOW_ROOT(a);
a = a->GetParent())
a->MarkIntrinsicWidthsDirty();
a->MarkIntrinsicISizesDirty();
}
if (aIntrinsicDirty == eStyleChange) {
@ -2864,7 +2864,7 @@ PresShell::FrameNeedsReflow(nsIFrame *aFrame, IntrinsicDirty aIntrinsicDirty,
nsFrameList::Enumerator childFrames(lists.CurrentList());
for (; !childFrames.AtEnd(); childFrames.Next()) {
nsIFrame* kid = childFrames.get();
kid->MarkIntrinsicWidthsDirty();
kid->MarkIntrinsicISizesDirty();
stack.AppendElement(kid);
}
}

8
layout/forms/nsComboboxControlFrame.cpp
View File

@ -693,8 +693,8 @@ static void printSize(char * aDesc, nscoord aSize)
//-------------------------------------------------------------------
nscoord
nsComboboxControlFrame::GetIntrinsicWidth(nsRenderingContext* aRenderingContext,
nsLayoutUtils::IntrinsicWidthType aType)
nsComboboxControlFrame::GetIntrinsicISize(nsRenderingContext* aRenderingContext,
nsLayoutUtils::IntrinsicISizeType aType)
{
// get the scrollbar width, we'll use this later
nscoord scrollbarWidth = 0;
@ -749,7 +749,7 @@ nsComboboxControlFrame::GetMinISize(nsRenderingContext *aRenderingContext)
{
nscoord minWidth;
DISPLAY_MIN_WIDTH(this, minWidth);
minWidth = GetIntrinsicWidth(aRenderingContext, nsLayoutUtils::MIN_WIDTH);
minWidth = GetIntrinsicISize(aRenderingContext, nsLayoutUtils::MIN_WIDTH);
return minWidth;
}
@ -758,7 +758,7 @@ nsComboboxControlFrame::GetPrefISize(nsRenderingContext *aRenderingContext)
{
nscoord prefWidth;
DISPLAY_PREF_WIDTH(this, prefWidth);
prefWidth = GetIntrinsicWidth(aRenderingContext, nsLayoutUtils::PREF_WIDTH);
prefWidth = GetIntrinsicISize(aRenderingContext, nsLayoutUtils::PREF_WIDTH);
return prefWidth;
}

4
layout/forms/nsComboboxControlFrame.h
View File

@ -217,8 +217,8 @@ protected:
DropDownPositionState AbsolutelyPositionDropDown();
// Helper for GetMinISize/GetPrefISize
nscoord GetIntrinsicWidth(nsRenderingContext* aRenderingContext,
nsLayoutUtils::IntrinsicWidthType aType);
nscoord GetIntrinsicISize(nsRenderingContext* aRenderingContext,
nsLayoutUtils::IntrinsicISizeType aType);
class RedisplayTextEvent : public nsRunnable {
public:

8
layout/forms/nsFieldSetFrame.cpp
View File

@ -262,8 +262,8 @@ nsFieldSetFrame::PaintBorderBackground(nsRenderingContext& aRenderingContext,
}
nscoord
nsFieldSetFrame::GetIntrinsicWidth(nsRenderingContext* aRenderingContext,
nsLayoutUtils::IntrinsicWidthType aType)
nsFieldSetFrame::GetIntrinsicISize(nsRenderingContext* aRenderingContext,
nsLayoutUtils::IntrinsicISizeType aType)
{
nscoord legendWidth = 0;
nscoord contentWidth = 0;
@ -291,7 +291,7 @@ nsFieldSetFrame::GetMinISize(nsRenderingContext* aRenderingContext)
nscoord result = 0;
DISPLAY_MIN_WIDTH(this, result);
result = GetIntrinsicWidth(aRenderingContext, nsLayoutUtils::MIN_WIDTH);
result = GetIntrinsicISize(aRenderingContext, nsLayoutUtils::MIN_WIDTH);
return result;
}
@ -301,7 +301,7 @@ nsFieldSetFrame::GetPrefISize(nsRenderingContext* aRenderingContext)
nscoord result = 0;
DISPLAY_PREF_WIDTH(this, result);
result = GetIntrinsicWidth(aRenderingContext, nsLayoutUtils::PREF_WIDTH);
result = GetIntrinsicISize(aRenderingContext, nsLayoutUtils::PREF_WIDTH);
return result;
}

4
layout/forms/nsFieldSetFrame.h
View File

@ -17,8 +17,8 @@ public:
nsFieldSetFrame(nsStyleContext* aContext);
nscoord
GetIntrinsicWidth(nsRenderingContext* aRenderingContext,
nsLayoutUtils::IntrinsicWidthType);
GetIntrinsicISize(nsRenderingContext* aRenderingContext,
nsLayoutUtils::IntrinsicISizeType);
virtual nscoord GetMinISize(nsRenderingContext* aRenderingContext) MOZ_OVERRIDE;
virtual nscoord GetPrefISize(nsRenderingContext* aRenderingContext) MOZ_OVERRIDE;
virtual nsSize ComputeSize(nsRenderingContext *aRenderingContext,

4
layout/forms/nsFormControlFrame.cpp
View File

@ -45,7 +45,7 @@ NS_QUERYFRAME_TAIL_INHERITING(nsLeafFrame)
NS_IMPL_FRAMEARENA_HELPERS(nsFormControlFrame)
nscoord
nsFormControlFrame::GetIntrinsicWidth()
nsFormControlFrame::GetIntrinsicISize()
{
// Provide a reasonable default for sites that use an "auto" height.
// Note that if you change this, you should change the values in forms.css
@ -54,7 +54,7 @@ nsFormControlFrame::GetIntrinsicWidth()
}
nscoord
nsFormControlFrame::GetIntrinsicHeight()
nsFormControlFrame::GetIntrinsicBSize()
{
// Provide a reasonable default for sites that use an "auto" height.
// Note that if you change this, you should change the values in forms.css

4
layout/forms/nsFormControlFrame.h
View File

@ -79,8 +79,8 @@ protected:
virtual ~nsFormControlFrame();
virtual nscoord GetIntrinsicWidth() MOZ_OVERRIDE;
virtual nscoord GetIntrinsicHeight() MOZ_OVERRIDE;
virtual nscoord GetIntrinsicISize() MOZ_OVERRIDE;
virtual nscoord GetIntrinsicBSize() MOZ_OVERRIDE;
//
//-------------------------------------------------------------------------------------

8
layout/forms/nsListControlFrame.cpp
View File

@ -396,7 +396,7 @@ nsListControlFrame::Reflow(nsPresContext* aPresContext,
if (!(GetStateBits() & NS_FRAME_FIRST_REFLOW) && autoHeight) {
// When not doing an initial reflow, and when the height is auto, start off
// with our computed height set to what we'd expect our height to be.
nscoord computedHeight = CalcIntrinsicHeight(oldHeightOfARow, length);
nscoord computedHeight = CalcIntrinsicBSize(oldHeightOfARow, length);
computedHeight = state.ApplyMinMaxHeight(computedHeight);
state.SetComputedHeight(computedHeight);
}
@ -415,7 +415,7 @@ nsListControlFrame::Reflow(nsPresContext* aPresContext,
if (!autoHeight) {
// Update our mNumDisplayRows based on our new row height now that we
// know it. Note that if autoHeight and we landed in this code then we
// already set mNumDisplayRows in CalcIntrinsicHeight. Also note that we
// already set mNumDisplayRows in CalcIntrinsicBSize. Also note that we
// can't use HeightOfARow() here because that just uses a cached value
// that we didn't compute.
nscoord rowHeight = CalcHeightOfARow();
@ -453,7 +453,7 @@ nsListControlFrame::Reflow(nsPresContext* aPresContext,
nsDidReflowStatus::FINISHED);
// Now compute the height we want to have
nscoord computedHeight = CalcIntrinsicHeight(HeightOfARow(), length);
nscoord computedHeight = CalcIntrinsicBSize(HeightOfARow(), length);
computedHeight = state.ApplyMinMaxHeight(computedHeight);
state.SetComputedHeight(computedHeight);
@ -1526,7 +1526,7 @@ nsListControlFrame::CalcFallbackRowHeight(float aFontSizeInflation)
}
nscoord
nsListControlFrame::CalcIntrinsicHeight(nscoord aHeightOfARow,
nsListControlFrame::CalcIntrinsicBSize(nscoord aHeightOfARow,
int32_t aNumberOfOptions)
{
NS_PRECONDITION(!IsInDropDownMode(),

4
layout/forms/nsListControlFrame.h
View File

@ -332,9 +332,9 @@ protected:
// guess at a row height based on our own style.
nscoord CalcFallbackRowHeight(float aFontSizeInflation);
// CalcIntrinsicHeight computes our intrinsic height (taking the "size"
// CalcIntrinsicBSize computes our intrinsic height (taking the "size"
// attribute into account). This should only be called in non-dropdown mode.
nscoord CalcIntrinsicHeight(nscoord aHeightOfARow, int32_t aNumberOfOptions);
nscoord CalcIntrinsicBSize(nscoord aHeightOfARow, int32_t aNumberOfOptions);
// Dropped down stuff
void SetComboboxItem(int32_t aIndex);

16
layout/generic/TextOverflow.cpp
View File

@ -513,7 +513,7 @@ TextOverflow::ExamineLineFrames(nsLineBox* aLine,
if (clippedMarkerEdges.mAssignedLeft &&
clippedMarkerEdges.mLeft - mContentArea.X() > 0) {
mLeft.mWidth = clippedMarkerEdges.mLeft - mContentArea.X();
NS_ASSERTION(mLeft.mWidth < mLeft.mIntrinsicWidth,
NS_ASSERTION(mLeft.mWidth < mLeft.mIntrinsicISize,
"clipping a marker should make it strictly smaller");
clippedLeftMarker = true;
} else {
@ -525,7 +525,7 @@ TextOverflow::ExamineLineFrames(nsLineBox* aLine,
if (clippedMarkerEdges.mAssignedRight &&
mContentArea.XMost() - clippedMarkerEdges.mRight > 0) {
mRight.mWidth = mContentArea.XMost() - clippedMarkerEdges.mRight;
NS_ASSERTION(mRight.mWidth < mRight.mIntrinsicWidth,
NS_ASSERTION(mRight.mWidth < mRight.mIntrinsicISize,
"clipping a marker should make it strictly smaller");
clippedRightMarker = true;
} else {
@ -536,9 +536,9 @@ TextOverflow::ExamineLineFrames(nsLineBox* aLine,
// The line simply has no visible content even without markers,
// so examine the line again without suppressing markers.
retryEmptyLine = false;
mLeft.mWidth = mLeft.mIntrinsicWidth;
mLeft.mWidth = mLeft.mIntrinsicISize;
mLeft.mActive = guessLeft = leftOverflow;
mRight.mWidth = mRight.mIntrinsicWidth;
mRight.mWidth = mRight.mIntrinsicISize;
mRight.mActive = guessRight = rightOverflow;
continue;
}
@ -715,9 +715,9 @@ TextOverflow::CreateMarkers(const nsLineBox* aLine,
DisplayListClipState::AutoSaveRestore clipState(mBuilder);
//XXX Needs vertical text love
nsRect markerRect = nsRect(aInsideMarkersArea.x - mLeft.mIntrinsicWidth,
nsRect markerRect = nsRect(aInsideMarkersArea.x - mLeft.mIntrinsicISize,
aLine->BStart(),
mLeft.mIntrinsicWidth, aLine->BSize());
mLeft.mIntrinsicISize, aLine->BSize());
markerRect += mBuilder->ToReferenceFrame(mBlock);
ClipMarker(mContentArea + mBuilder->ToReferenceFrame(mBlock),
markerRect, clipState);
@ -732,7 +732,7 @@ TextOverflow::CreateMarkers(const nsLineBox* aLine,
nsRect markerRect = nsRect(aInsideMarkersArea.XMost(),
aLine->BStart(),
mRight.mIntrinsicWidth, aLine->BSize());
mRight.mIntrinsicISize, aLine->BSize());
markerRect += mBuilder->ToReferenceFrame(mBlock);
ClipMarker(mContentArea + mBuilder->ToReferenceFrame(mBlock),
markerRect, clipState);
@ -767,7 +767,7 @@ TextOverflow::Marker::SetupString(nsIFrame* aFrame)
mWidth = nsLayoutUtils::GetStringWidth(aFrame, rc, mStyle->mString.get(),
mStyle->mString.Length());
}
mIntrinsicWidth = mWidth;
mIntrinsicISize = mWidth;
mInitialized = true;
}

4
layout/generic/TextOverflow.h
View File

@ -216,10 +216,10 @@ class TextOverflow {
mHasOverflow = false;
}
// The current width of the marker, the range is [0 .. mIntrinsicWidth].
// The current width of the marker, the range is [0 .. mIntrinsicISize].
nscoord mWidth;
// The intrinsic width of the marker.
nscoord mIntrinsicWidth;
nscoord mIntrinsicISize;
// The style for this side.
const nsStyleTextOverflowSide* mStyle;
// True if there is visible overflowing inline content on this side.

4
layout/generic/nsBlockFrame.cpp
View File

@ -627,7 +627,7 @@ RemoveFirstLine(nsLineList& aFromLines, nsFrameList& aFromFrames,
// Reflow methods
/* virtual */ void
nsBlockFrame::MarkIntrinsicWidthsDirty()
nsBlockFrame::MarkIntrinsicISizesDirty()
{
nsBlockFrame* dirtyBlock = static_cast<nsBlockFrame*>(FirstContinuation());
dirtyBlock->mMinWidth = NS_INTRINSIC_WIDTH_UNKNOWN;
@ -639,7 +639,7 @@ nsBlockFrame::MarkIntrinsicWidthsDirty()
}
}
nsBlockFrameSuper::MarkIntrinsicWidthsDirty();
nsBlockFrameSuper::MarkIntrinsicISizesDirty();
}
void

2
layout/generic/nsBlockFrame.h
View File

@ -224,7 +224,7 @@ public:
return outside ? outside : GetInsideBullet();
}
virtual void MarkIntrinsicWidthsDirty() MOZ_OVERRIDE;
virtual void MarkIntrinsicISizesDirty() MOZ_OVERRIDE;
private:
void CheckIntrinsicCacheAgainstShrinkWrapState();
public:

2
layout/generic/nsContainerFrame.cpp
View File

@ -786,7 +786,7 @@ static nscoord GetCoord(const nsStyleCoord& aCoord, nscoord aIfNotCoord)
void
nsContainerFrame::DoInlineIntrinsicISize(nsRenderingContext *aRenderingContext,
InlineIntrinsicISizeData *aData,
nsLayoutUtils::IntrinsicWidthType aType)
nsLayoutUtils::IntrinsicISizeType aType)
{
if (GetPrevInFlow())
return; // Already added.

2
layout/generic/nsContainerFrame.h
View File

@ -216,7 +216,7 @@ public:
// Used by both nsInlineFrame and nsFirstLetterFrame.
void DoInlineIntrinsicISize(nsRenderingContext *aRenderingContext,
InlineIntrinsicISizeData *aData,
nsLayoutUtils::IntrinsicWidthType aType);
nsLayoutUtils::IntrinsicISizeType aType);
/**
* This is the CSS block concept of computing 'auto' widths, which most

2
layout/generic/nsFlexContainerFrame.cpp
View File

@ -3815,7 +3815,7 @@ nsFlexContainerFrame::GetPrefISize(nsRenderingContext* aRenderingContext)
// XXXdholbert Optimization: We could cache our intrinsic widths like
// nsBlockFrame does (and return it early from this function if it's set).
// Whenever anything happens that might change it, set it to
// NS_INTRINSIC_WIDTH_UNKNOWN (like nsBlockFrame::MarkIntrinsicWidthsDirty
// NS_INTRINSIC_WIDTH_UNKNOWN (like nsBlockFrame::MarkIntrinsicISizesDirty
// does)
FlexboxAxisTracker axisTracker(this);

18
layout/generic/nsFrame.cpp
View File

@ -152,7 +152,7 @@ InitBoxMetrics(nsIFrame* aFrame, bool aClear)
nsBoxLayoutMetrics *metrics = new nsBoxLayoutMetrics();
props.Set(BoxMetricsProperty(), metrics);
static_cast<nsFrame*>(aFrame)->nsFrame::MarkIntrinsicWidthsDirty();
static_cast<nsFrame*>(aFrame)->nsFrame::MarkIntrinsicISizesDirty();
metrics->mBlockAscent = 0;
metrics->mLastSize.SizeTo(0, 0);
}
@ -3776,7 +3776,7 @@ nsFrame::GetCursor(const nsPoint& aPoint,
// Resize and incremental reflow
/* virtual */ void
nsFrame::MarkIntrinsicWidthsDirty()
nsFrame::MarkIntrinsicISizesDirty()
{
// This version is meant only for what used to be box-to-block adaptors.
// It should not be called by other derived classes.
@ -3971,10 +3971,10 @@ AddCoord(const nsStyleCoord& aStyle,
}
}
/* virtual */ nsIFrame::IntrinsicWidthOffsetData
nsFrame::IntrinsicWidthOffsets(nsRenderingContext* aRenderingContext)
/* virtual */ nsIFrame::IntrinsicISizeOffsetData
nsFrame::IntrinsicISizeOffsets(nsRenderingContext* aRenderingContext)
{
IntrinsicWidthOffsetData result;
IntrinsicISizeOffsetData result;
const nsStyleMargin *styleMargin = StyleMargin();
AddCoord(styleMargin->mMargin.GetLeft(), aRenderingContext, this,
@ -8774,13 +8774,13 @@ DR_intrinsic_width_cookie::DR_intrinsic_width_cookie(
, mResult(aResult)
{
MOZ_COUNT_CTOR(DR_intrinsic_width_cookie);
mValue = nsFrame::DisplayIntrinsicWidthEnter(mFrame, mType);
mValue = nsFrame::DisplayIntrinsicISizeEnter(mFrame, mType);
}
DR_intrinsic_width_cookie::~DR_intrinsic_width_cookie()
{
MOZ_COUNT_DTOR(DR_intrinsic_width_cookie);
nsFrame::DisplayIntrinsicWidthExit(mFrame, mType, mResult, mValue);
nsFrame::DisplayIntrinsicISizeExit(mFrame, mType, mResult, mValue);
}
DR_intrinsic_size_cookie::DR_intrinsic_size_cookie(
@ -9530,7 +9530,7 @@ void* nsFrame::DisplayLayoutEnter(nsIFrame* aFrame)
return treeNode;
}
void* nsFrame::DisplayIntrinsicWidthEnter(nsIFrame* aFrame,
void* nsFrame::DisplayIntrinsicISizeEnter(nsIFrame* aFrame,
const char* aType)
{
if (!DR_state->mInited) DR_state->Init();
@ -9642,7 +9642,7 @@ void nsFrame::DisplayLayoutExit(nsIFrame* aFrame,
DR_state->DeleteTreeNode(*treeNode);
}
void nsFrame::DisplayIntrinsicWidthExit(nsIFrame* aFrame,
void nsFrame::DisplayIntrinsicISizeExit(nsIFrame* aFrame,
const char* aType,
nscoord aResult,
void* aFrameTreeNode)

10
layout/generic/nsFrame.h
View File

@ -237,15 +237,15 @@ public:
virtual bool IsEmpty() MOZ_OVERRIDE;
virtual bool IsSelfEmpty() MOZ_OVERRIDE;
virtual void MarkIntrinsicWidthsDirty() MOZ_OVERRIDE;
virtual void MarkIntrinsicISizesDirty() MOZ_OVERRIDE;
virtual nscoord GetMinISize(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
virtual nscoord GetPrefISize(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
virtual void AddInlineMinISize(nsRenderingContext *aRenderingContext,
InlineMinISizeData *aData) MOZ_OVERRIDE;
virtual void AddInlinePrefISize(nsRenderingContext *aRenderingContext,
InlinePrefISizeData *aData) MOZ_OVERRIDE;
virtual IntrinsicWidthOffsetData
IntrinsicWidthOffsets(nsRenderingContext* aRenderingContext) MOZ_OVERRIDE;
virtual IntrinsicISizeOffsetData
IntrinsicISizeOffsets(nsRenderingContext* aRenderingContext) MOZ_OVERRIDE;
virtual mozilla::IntrinsicSize GetIntrinsicSize() MOZ_OVERRIDE;
virtual nsSize GetIntrinsicRatio() MOZ_OVERRIDE;
@ -443,7 +443,7 @@ public:
nsIFrame* aFrame,
const nsHTMLReflowState& aReflowState);
static void* DisplayLayoutEnter(nsIFrame* aFrame);
static void* DisplayIntrinsicWidthEnter(nsIFrame* aFrame,
static void* DisplayIntrinsicISizeEnter(nsIFrame* aFrame,
const char* aType);
static void* DisplayIntrinsicSizeEnter(nsIFrame* aFrame,
const char* aType);
@ -454,7 +454,7 @@ public:
void* aFrameTreeNode);
static void DisplayLayoutExit(nsIFrame* aFrame,
void* aFrameTreeNode);
static void DisplayIntrinsicWidthExit(nsIFrame* aFrame,
static void DisplayIntrinsicISizeExit(nsIFrame* aFrame,
const char* aType,
nscoord aResult,
void* aFrameTreeNode);

16
layout/generic/nsFrameSetFrame.cpp
View File

@ -111,8 +111,8 @@ public:
protected:
nsHTMLFramesetBorderFrame(nsStyleContext* aContext, int32_t aWidth, bool aVertical, bool aVisible);
virtual ~nsHTMLFramesetBorderFrame();
virtual nscoord GetIntrinsicWidth() MOZ_OVERRIDE;
virtual nscoord GetIntrinsicHeight() MOZ_OVERRIDE;
virtual nscoord GetIntrinsicISize() MOZ_OVERRIDE;
virtual nscoord GetIntrinsicBSize() MOZ_OVERRIDE;
// the prev and next neighbors are indexes into the row (for a horizontal border) or col (for
// a vertical border) of nsHTMLFramesetFrames or nsHTMLFrames
@ -155,8 +155,8 @@ public:
protected:
nsHTMLFramesetBlankFrame(nsStyleContext* aContext) : nsLeafFrame(aContext) {}
virtual ~nsHTMLFramesetBlankFrame();
virtual nscoord GetIntrinsicWidth() MOZ_OVERRIDE;
virtual nscoord GetIntrinsicHeight() MOZ_OVERRIDE;
virtual nscoord GetIntrinsicISize() MOZ_OVERRIDE;
virtual nscoord GetIntrinsicBSize() MOZ_OVERRIDE;
friend class nsHTMLFramesetFrame;
friend class nsHTMLFrameset;
@ -1417,13 +1417,13 @@ nsHTMLFramesetBorderFrame::~nsHTMLFramesetBorderFrame()
NS_IMPL_FRAMEARENA_HELPERS(nsHTMLFramesetBorderFrame)
nscoord nsHTMLFramesetBorderFrame::GetIntrinsicWidth()
nscoord nsHTMLFramesetBorderFrame::GetIntrinsicISize()
{
// No intrinsic width
return 0;
}
nscoord nsHTMLFramesetBorderFrame::GetIntrinsicHeight()
nscoord nsHTMLFramesetBorderFrame::GetIntrinsicBSize()
{
// No intrinsic height
return 0;
@ -1635,13 +1635,13 @@ nsHTMLFramesetBlankFrame::~nsHTMLFramesetBlankFrame()
//printf("nsHTMLFramesetBlankFrame destructor %p \n", this);
}
nscoord nsHTMLFramesetBlankFrame::GetIntrinsicWidth()
nscoord nsHTMLFramesetBlankFrame::GetIntrinsicISize()
{
// No intrinsic width
return 0;
}
nscoord nsHTMLFramesetBlankFrame::GetIntrinsicHeight()
nscoord nsHTMLFramesetBlankFrame::GetIntrinsicBSize()
{
// No intrinsic height
return 0;

2
layout/generic/nsHTMLReflowState.cpp
View File

@ -544,7 +544,7 @@ nsHTMLReflowState::InitResizeFlags(nsPresContext* aPresContext, nsIAtom* aFrameT
nsFrameList::Enumerator childFrames(lists.CurrentList());
for (; !childFrames.AtEnd(); childFrames.Next()) {
nsIFrame* kid = childFrames.get();
kid->MarkIntrinsicWidthsDirty();
kid->MarkIntrinsicISizesDirty();
stack.AppendElement(kid);
}
}

12
layout/generic/nsIFrame.h
View File

@ -1442,7 +1442,7 @@ public:
* re-calculation). Note that this should generally not be called
* directly; nsPresShell::FrameNeedsReflow will call it instead.
*/
virtual void MarkIntrinsicWidthsDirty() = 0;
virtual void MarkIntrinsicISizesDirty() = 0;
/**
* Get the min-content intrinsic inline size of the frame. This must be
@ -1458,7 +1458,7 @@ public:
* padding and border.
*
* Note that many frames will cache the result of this function call
* unless MarkIntrinsicWidthsDirty is called.
* unless MarkIntrinsicISizesDirty is called.
*
* It is not acceptable for a frame to mark itself dirty when this
* method is called.
@ -1606,17 +1606,17 @@ public:
* Return the horizontal components of padding, border, and margin
* that contribute to the intrinsic width that applies to the parent.
*/
struct IntrinsicWidthOffsetData {
struct IntrinsicISizeOffsetData {
nscoord hPadding, hBorder, hMargin;
float hPctPadding, hPctMargin;
IntrinsicWidthOffsetData()
IntrinsicISizeOffsetData()
: hPadding(0), hBorder(0), hMargin(0)
, hPctPadding(0.0f), hPctMargin(0.0f)
{}
};
virtual IntrinsicWidthOffsetData
IntrinsicWidthOffsets(nsRenderingContext* aRenderingContext) = 0;
virtual IntrinsicISizeOffsetData
IntrinsicISizeOffsets(nsRenderingContext* aRenderingContext) = 0;
virtual mozilla::IntrinsicSize GetIntrinsicSize() = 0;

8
layout/generic/nsLeafFrame.cpp
View File

@ -22,7 +22,7 @@ nsLeafFrame::GetMinISize(nsRenderingContext *aRenderingContext)
nscoord result;
DISPLAY_MIN_WIDTH(this, result);
result = GetIntrinsicWidth();
result = GetIntrinsicISize();
return result;
}
@ -31,7 +31,7 @@ nsLeafFrame::GetPrefISize(nsRenderingContext *aRenderingContext)
{
nscoord result;
DISPLAY_PREF_WIDTH(this, result);
result = GetIntrinsicWidth();
result = GetIntrinsicISize();
return result;
}
@ -41,7 +41,7 @@ nsLeafFrame::ComputeAutoSize(nsRenderingContext *aRenderingContext,
nsSize aMargin, nsSize aBorder,
nsSize aPadding, bool aShrinkWrap)
{
return nsSize(GetIntrinsicWidth(), GetIntrinsicHeight());
return nsSize(GetIntrinsicISize(), GetIntrinsicBSize());
}
void
@ -94,7 +94,7 @@ nsLeafFrame::DoReflow(nsPresContext* aPresContext,
}
nscoord
nsLeafFrame::GetIntrinsicHeight()
nsLeafFrame::GetIntrinsicBSize()
{
NS_NOTREACHED("Someone didn't override Reflow or ComputeAutoSize");
return 0;

8
layout/generic/nsLeafFrame.h
View File

@ -31,7 +31,7 @@ public:
}
/**
* Both GetMinISize and GetPrefISize will return whatever GetIntrinsicWidth
* Both GetMinISize and GetPrefISize will return whatever GetIntrinsicISize
* returns.
*/
virtual nscoord GetMinISize(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
@ -47,7 +47,7 @@ public:
/**
* Reflow our frame. This will use the computed width plus borderpadding for
* the desired width, and use the return value of GetIntrinsicHeight plus
* the desired width, and use the return value of GetIntrinsicBSize plus
* borderpadding for the desired height. Ascent will be set to the height,
* and descent will be set to 0.
*/
@ -80,7 +80,7 @@ protected:
* should not include borders or padding and should not depend on the applied
* styles.
*/
virtual nscoord GetIntrinsicWidth() = 0;
virtual nscoord GetIntrinsicISize() = 0;
/**
* Return the intrinsic height of the frame's content area. This should not
@ -89,7 +89,7 @@ protected:
* Reflow and ComputeAutoSize; the default Reflow and ComputeAutoSize impls
* call this method.
*/
virtual nscoord GetIntrinsicHeight();
virtual nscoord GetIntrinsicBSize();
/**
* Subroutine to add in borders and padding

6
layout/generic/nsPageFrame.cpp
View File

@ -650,13 +650,13 @@ nsPageBreakFrame::~nsPageBreakFrame()
}
nscoord
nsPageBreakFrame::GetIntrinsicWidth()
nsPageBreakFrame::GetIntrinsicISize()
{
return nsPresContext::CSSPixelsToAppUnits(1);
}
nscoord
nsPageBreakFrame::GetIntrinsicHeight()
nsPageBreakFrame::GetIntrinsicBSize()
{
return 0;
}
@ -673,7 +673,7 @@ nsPageBreakFrame::Reflow(nsPresContext* aPresContext,
// Override reflow, since we don't want to deal with what our
// computed values are.
WritingMode wm = aReflowState.GetWritingMode();
LogicalSize finalSize(wm, GetIntrinsicWidth(),
LogicalSize finalSize(wm, GetIntrinsicISize(),
aReflowState.AvailableBSize() == NS_UNCONSTRAINEDSIZE ?
0 : aReflowState.AvailableBSize());
// round the height down to the nearest pixel

4
layout/generic/nsPageFrame.h
View File

@ -117,8 +117,8 @@ class nsPageBreakFrame : public nsLeafFrame
protected:
virtual nscoord GetIntrinsicWidth() MOZ_OVERRIDE;
virtual nscoord GetIntrinsicHeight() MOZ_OVERRIDE;
virtual nscoord GetIntrinsicISize() MOZ_OVERRIDE;
virtual nscoord GetIntrinsicBSize() MOZ_OVERRIDE;
bool mHaveReflowed;

8
layout/generic/nsSubDocumentFrame.cpp
View File

@ -557,7 +557,7 @@ nsSubDocumentFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
}
nscoord
nsSubDocumentFrame::GetIntrinsicWidth()
nsSubDocumentFrame::GetIntrinsicISize()
{
if (!IsInline()) {
return 0; // HTML <frame> has no useful intrinsic width
@ -576,7 +576,7 @@ nsSubDocumentFrame::GetIntrinsicWidth()
}
nscoord
nsSubDocumentFrame::GetIntrinsicHeight()
nsSubDocumentFrame::GetIntrinsicBSize()
{
// <frame> processing does not use this routine, only <iframe>
NS_ASSERTION(IsInline(), "Shouldn't have been called");
@ -633,7 +633,7 @@ nsSubDocumentFrame::GetMinISize(nsRenderingContext *aRenderingContext)
if (subDocRoot) {
result = subDocRoot->GetMinISize(aRenderingContext);
} else {
result = GetIntrinsicWidth();
result = GetIntrinsicISize();
}
return result;
@ -649,7 +649,7 @@ nsSubDocumentFrame::GetPrefISize(nsRenderingContext *aRenderingContext)
if (subDocRoot) {
result = subDocRoot->GetPrefISize(aRenderingContext);
} else {
result = GetIntrinsicWidth();
result = GetIntrinsicISize();
}
return result;

4
layout/generic/nsSubDocumentFrame.h
View File

@ -127,8 +127,8 @@ protected:
bool IsInline() { return mIsInline; }
virtual nscoord GetIntrinsicWidth() MOZ_OVERRIDE;
virtual nscoord GetIntrinsicHeight() MOZ_OVERRIDE;
virtual nscoord GetIntrinsicISize() MOZ_OVERRIDE;
virtual nscoord GetIntrinsicBSize() MOZ_OVERRIDE;
// Show our document viewer. The document viewer is hidden via a script
// runner, so that we can save and restore the presentation if we're

4
layout/generic/nsTextFrame.cpp
View File

@ -6998,10 +6998,10 @@ nsTextFrame::SetFontSizeInflation(float aInflation)
}
/* virtual */
void nsTextFrame::MarkIntrinsicWidthsDirty()
void nsTextFrame::MarkIntrinsicISizesDirty()
{
ClearTextRuns();
nsFrame::MarkIntrinsicWidthsDirty();
nsFrame::MarkIntrinsicISizesDirty();
}
// XXX this doesn't handle characters shaped by line endings. We need to

2
layout/generic/nsTextFrame.h
View File

@ -200,7 +200,7 @@ public:
}
void SetFontSizeInflation(float aInflation);
virtual void MarkIntrinsicWidthsDirty() MOZ_OVERRIDE;
virtual void MarkIntrinsicISizesDirty() MOZ_OVERRIDE;
virtual nscoord GetMinISize(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
virtual nscoord GetPrefISize(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
virtual void AddInlineMinISize(nsRenderingContext *aRenderingContext,

8
layout/mathml/nsMathMLContainerFrame.cpp
View File

@ -964,7 +964,7 @@ nsMathMLContainerFrame::GetMinISize(nsRenderingContext *aRenderingContext)
nscoord result;
DISPLAY_MIN_WIDTH(this, result);
nsHTMLReflowMetrics desiredSize(GetWritingMode());
GetIntrinsicWidthMetrics(aRenderingContext, desiredSize);
GetIntrinsicISizeMetrics(aRenderingContext, desiredSize);
// Include the additional width added by FixInterFrameSpacing to ensure
// consistent width calculations.
@ -979,7 +979,7 @@ nsMathMLContainerFrame::GetPrefISize(nsRenderingContext *aRenderingContext)
nscoord result;
DISPLAY_PREF_WIDTH(this, result);
nsHTMLReflowMetrics desiredSize(GetWritingMode());
GetIntrinsicWidthMetrics(aRenderingContext, desiredSize);
GetIntrinsicISizeMetrics(aRenderingContext, desiredSize);
// Include the additional width added by FixInterFrameSpacing to ensure
// consistent width calculations.
@ -989,7 +989,7 @@ nsMathMLContainerFrame::GetPrefISize(nsRenderingContext *aRenderingContext)
}
/* virtual */ void
nsMathMLContainerFrame::GetIntrinsicWidthMetrics(nsRenderingContext* aRenderingContext, nsHTMLReflowMetrics& aDesiredSize)
nsMathMLContainerFrame::GetIntrinsicISizeMetrics(nsRenderingContext* aRenderingContext, nsHTMLReflowMetrics& aDesiredSize)
{
// Get child widths
nsIFrame* childFrame = mFrames.FirstChild();
@ -998,7 +998,7 @@ nsMathMLContainerFrame::GetIntrinsicWidthMetrics(nsRenderingContext* aRenderingC
nsMathMLContainerFrame* containerFrame = do_QueryFrame(childFrame);
if (containerFrame) {
containerFrame->GetIntrinsicWidthMetrics(aRenderingContext,
containerFrame->GetIntrinsicISizeMetrics(aRenderingContext,
childDesiredSize);
} else {
// XXX This includes margin while Reflow currently doesn't consider

6
layout/mathml/nsMathMLContainerFrame.h
View File

@ -103,7 +103,7 @@ public:
* Return the intrinsic horizontal metrics of the frame's content area.
*/
virtual void
GetIntrinsicWidthMetrics(nsRenderingContext* aRenderingContext,
GetIntrinsicISizeMetrics(nsRenderingContext* aRenderingContext,
nsHTMLReflowMetrics& aDesiredSize);
virtual void
@ -204,10 +204,10 @@ protected:
// MeasureForWidth:
//
// A method used by nsMathMLContainerFrame::GetIntrinsicWidth to get the
// A method used by nsMathMLContainerFrame::GetIntrinsicISize to get the
// width that a particular Place method desires. For most frames, this will
// just call the object's Place method. However <msqrt> and <menclose> use
// nsMathMLContainerFrame::GetIntrinsicWidth to measure the child frames as
// nsMathMLContainerFrame::GetIntrinsicISize to measure the child frames as
// if in an <mrow>, and so their frames implement MeasureForWidth to use
// nsMathMLContainerFrame::Place.
virtual nsresult

2
layout/mathml/nsMathMLmfencedFrame.cpp
View File

@ -554,7 +554,7 @@ GetMaxCharWidth(nsPresContext* aPresContext,
}
/* virtual */ void
nsMathMLmfencedFrame::GetIntrinsicWidthMetrics(nsRenderingContext* aRenderingContext, nsHTMLReflowMetrics& aDesiredSize)
nsMathMLmfencedFrame::GetIntrinsicISizeMetrics(nsRenderingContext* aRenderingContext, nsHTMLReflowMetrics& aDesiredSize)
{
nscoord width = 0;

2
layout/mathml/nsMathMLmfencedFrame.h
View File

@ -43,7 +43,7 @@ public:
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
virtual void
GetIntrinsicWidthMetrics(nsRenderingContext* aRenderingContext,
GetIntrinsicISizeMetrics(nsRenderingContext* aRenderingContext,
nsHTMLReflowMetrics& aDesiredSize) MOZ_OVERRIDE;
virtual nsresult

8
layout/mathml/nsMathMLmoFrame.cpp
View File

@ -948,7 +948,7 @@ nsMathMLmoFrame::Reflow(nsPresContext* aPresContext,
}
/* virtual */ void
nsMathMLmoFrame::MarkIntrinsicWidthsDirty()
nsMathMLmoFrame::MarkIntrinsicISizesDirty()
{
// if we get this, it may mean that something changed in the text
// content. So blow away everything an re-build the automatic data
@ -969,11 +969,11 @@ nsMathMLmoFrame::MarkIntrinsicWidthsDirty()
// so that we don't rebuild multiple times for the same change.
RebuildAutomaticDataForChildren(target);
nsMathMLContainerFrame::MarkIntrinsicWidthsDirty();
nsMathMLContainerFrame::MarkIntrinsicISizesDirty();
}
/* virtual */ void
nsMathMLmoFrame::GetIntrinsicWidthMetrics(nsRenderingContext *aRenderingContext, nsHTMLReflowMetrics& aDesiredSize)
nsMathMLmoFrame::GetIntrinsicISizeMetrics(nsRenderingContext *aRenderingContext, nsHTMLReflowMetrics& aDesiredSize)
{
ProcessOperatorData();
if (UseMathMLChar()) {
@ -985,7 +985,7 @@ nsMathMLmoFrame::GetIntrinsicWidthMetrics(nsRenderingContext *aRenderingContext,
NS_MATHML_OPERATOR_MAXSIZE_IS_ABSOLUTE(mFlags));
}
else {
nsMathMLTokenFrame::GetIntrinsicWidthMetrics(aRenderingContext,
nsMathMLTokenFrame::GetIntrinsicISizeMetrics(aRenderingContext,
aDesiredSize);
}

4
layout/mathml/nsMathMLmoFrame.h
View File

@ -48,10 +48,10 @@ public:
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus) MOZ_OVERRIDE;
virtual void MarkIntrinsicWidthsDirty() MOZ_OVERRIDE;
virtual void MarkIntrinsicISizesDirty() MOZ_OVERRIDE;
virtual void
GetIntrinsicWidthMetrics(nsRenderingContext* aRenderingContext,
GetIntrinsicISizeMetrics(nsRenderingContext* aRenderingContext,
nsHTMLReflowMetrics& aDesiredSize) MOZ_OVERRIDE;
virtual nsresult

2
layout/mathml/nsMathMLmrootFrame.cpp
View File

@ -354,7 +354,7 @@ nsMathMLmrootFrame::Reflow(nsPresContext* aPresContext,
}
/* virtual */ void
nsMathMLmrootFrame::GetIntrinsicWidthMetrics(nsRenderingContext* aRenderingContext, nsHTMLReflowMetrics& aDesiredSize)
nsMathMLmrootFrame::GetIntrinsicISizeMetrics(nsRenderingContext* aRenderingContext, nsHTMLReflowMetrics& aDesiredSize)
{
nsIFrame* baseFrame = mFrames.FirstChild();
nsIFrame* indexFrame = nullptr;

2
layout/mathml/nsMathMLmrootFrame.h
View File

@ -47,7 +47,7 @@ public:
nscoord* aSqrOffset);
virtual void
GetIntrinsicWidthMetrics(nsRenderingContext* aRenderingContext,
GetIntrinsicISizeMetrics(nsRenderingContext* aRenderingContext,
nsHTMLReflowMetrics& aDesiredSize) MOZ_OVERRIDE;
virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder,

2
layout/svg/SVGTextFrame.cpp
View File

@ -5201,7 +5201,7 @@ SVGTextFrame::DoReflow()
if (UpdateFontSizeScaleFactor()) {
// If the font size scale factor changed, we need the block to report
// an updated preferred width.
kid->MarkIntrinsicWidthsDirty();
kid->MarkIntrinsicISizesDirty();
}
mState |= NS_STATE_SVG_TEXT_IN_REFLOW;

22
layout/tables/BasicTableLayoutStrategy.cpp
View File

@ -28,7 +28,7 @@ BasicTableLayoutStrategy::BasicTableLayoutStrategy(nsTableFrame *aTableFrame)
: nsITableLayoutStrategy(nsITableLayoutStrategy::Auto)
, mTableFrame(aTableFrame)
{
MarkIntrinsicWidthsDirty();
MarkIntrinsicISizesDirty();
}
/* virtual */
@ -41,7 +41,7 @@ BasicTableLayoutStrategy::GetMinISize(nsRenderingContext* aRenderingContext)
{
DISPLAY_MIN_WIDTH(mTableFrame, mMinWidth);
if (mMinWidth == NS_INTRINSIC_WIDTH_UNKNOWN)
ComputeIntrinsicWidths(aRenderingContext);
ComputeIntrinsicISizes(aRenderingContext);
return mMinWidth;
}
@ -54,7 +54,7 @@ BasicTableLayoutStrategy::GetPrefISize(nsRenderingContext* aRenderingContext,
(mPrefWidthPctExpand == NS_INTRINSIC_WIDTH_UNKNOWN),
"dirtyness out of sync");
if (mPrefWidth == NS_INTRINSIC_WIDTH_UNKNOWN)
ComputeIntrinsicWidths(aRenderingContext);
ComputeIntrinsicISizes(aRenderingContext);
return aComputingSize ? mPrefWidthPctExpand : mPrefWidth;
}
@ -100,7 +100,7 @@ GetWidthInfo(nsRenderingContext *aRenderingContext,
// outer edges near the end of this function.
// XXX Should we ignore percentage padding?
nsIFrame::IntrinsicWidthOffsetData offsets = aFrame->IntrinsicWidthOffsets(aRenderingContext);
nsIFrame::IntrinsicISizeOffsetData offsets = aFrame->IntrinsicISizeOffsets(aRenderingContext);
// In quirks mode, table cell width should be content-box,
// but height should be border box.
@ -266,7 +266,7 @@ GetColWidthInfo(nsRenderingContext *aRenderingContext,
* browsers are).
*/
void
BasicTableLayoutStrategy::ComputeColumnIntrinsicWidths(nsRenderingContext* aRenderingContext)
BasicTableLayoutStrategy::ComputeColumnIntrinsicISizes(nsRenderingContext* aRenderingContext)
{
nsTableFrame *tableFrame = mTableFrame;
nsTableCellMap *cellMap = tableFrame->GetCellMap();
@ -333,7 +333,7 @@ BasicTableLayoutStrategy::ComputeColumnIntrinsicWidths(nsRenderingContext* aRend
#endif
}
#ifdef DEBUG_TABLE_STRATEGY
printf("ComputeColumnIntrinsicWidths single\n");
printf("ComputeColumnIntrinsicISizes single\n");
mTableFrame->Dump(false, true, false);
#endif
@ -421,15 +421,15 @@ BasicTableLayoutStrategy::ComputeColumnIntrinsicWidths(nsRenderingContext* aRend
}
#ifdef DEBUG_TABLE_STRATEGY
printf("ComputeColumnIntrinsicWidths spanning\n");
printf("ComputeColumnIntrinsicISizes spanning\n");
mTableFrame->Dump(false, true, false);
#endif
}
void
BasicTableLayoutStrategy::ComputeIntrinsicWidths(nsRenderingContext* aRenderingContext)
BasicTableLayoutStrategy::ComputeIntrinsicISizes(nsRenderingContext* aRenderingContext)
{
ComputeColumnIntrinsicWidths(aRenderingContext);
ComputeColumnIntrinsicISizes(aRenderingContext);
nsTableCellMap *cellMap = mTableFrame->GetCellMap();
nscoord min = 0, pref = 0, max_small_pct_pref = 0, nonpct_pref_total = 0;
@ -511,7 +511,7 @@ BasicTableLayoutStrategy::ComputeIntrinsicWidths(nsRenderingContext* aRenderingC
}
/* virtual */ void
BasicTableLayoutStrategy::MarkIntrinsicWidthsDirty()
BasicTableLayoutStrategy::MarkIntrinsicISizesDirty()
{
mMinWidth = NS_INTRINSIC_WIDTH_UNKNOWN;
mPrefWidth = NS_INTRINSIC_WIDTH_UNKNOWN;
@ -536,7 +536,7 @@ BasicTableLayoutStrategy::ComputeColumnWidths(const nsHTMLReflowState& aReflowSt
"dirtyness out of sync");
// XXX Is this needed?
if (mMinWidth == NS_INTRINSIC_WIDTH_UNKNOWN)
ComputeIntrinsicWidths(aReflowState.rendContext);
ComputeIntrinsicISizes(aReflowState.rendContext);
nsTableCellMap *cellMap = mTableFrame->GetCellMap();
int32_t colCount = cellMap->GetColCount();

8
layout/tables/BasicTableLayoutStrategy.h
View File

@ -27,18 +27,18 @@ public:
virtual nscoord GetMinISize(nsRenderingContext* aRenderingContext) MOZ_OVERRIDE;
virtual nscoord GetPrefISize(nsRenderingContext* aRenderingContext,
bool aComputingSize) MOZ_OVERRIDE;
virtual void MarkIntrinsicWidthsDirty() MOZ_OVERRIDE;
virtual void MarkIntrinsicISizesDirty() MOZ_OVERRIDE;
virtual void ComputeColumnWidths(const nsHTMLReflowState& aReflowState) MOZ_OVERRIDE;
private:
// NOTE: Using prefix "BTLS" to avoid overlapping names with
// the values of nsLayoutUtils::IntrinsicWidthType
// the values of nsLayoutUtils::IntrinsicISizeType
enum BtlsWidthType { BTLS_MIN_WIDTH,
BTLS_PREF_WIDTH,
BTLS_FINAL_WIDTH };
// Compute intrinsic width member variables on the columns.
void ComputeColumnIntrinsicWidths(nsRenderingContext* aRenderingContext);
void ComputeColumnIntrinsicISizes(nsRenderingContext* aRenderingContext);
// Distribute a colspanning cell's percent width (if any) to its columns.
void DistributePctWidthToColumns(float aSpanPrefPct,
@ -69,7 +69,7 @@ private:
// Compute the min and pref widths of the table from the width
// variables on the columns.
void ComputeIntrinsicWidths(nsRenderingContext* aRenderingContext);
void ComputeIntrinsicISizes(nsRenderingContext* aRenderingContext);
nsTableFrame *mTableFrame;
nscoord mMinWidth;

8
layout/tables/FixedTableLayoutStrategy.cpp
View File

@ -19,7 +19,7 @@ FixedTableLayoutStrategy::FixedTableLayoutStrategy(nsTableFrame *aTableFrame)
: nsITableLayoutStrategy(nsITableLayoutStrategy::Fixed)
, mTableFrame(aTableFrame)
{
MarkIntrinsicWidthsDirty();
MarkIntrinsicISizesDirty();
}
/* virtual */
@ -132,7 +132,7 @@ FixedTableLayoutStrategy::GetPrefISize(nsRenderingContext* aRenderingContext,
}
/* virtual */ void
FixedTableLayoutStrategy::MarkIntrinsicWidthsDirty()
FixedTableLayoutStrategy::MarkIntrinsicISizesDirty()
{
mMinWidth = NS_INTRINSIC_WIDTH_UNKNOWN;
mLastCalcWidth = nscoord_MIN;
@ -247,8 +247,8 @@ FixedTableLayoutStrategy::ComputeColumnWidths(const nsHTMLReflowState& aReflowSt
cellFrame, nsLayoutUtils::MIN_WIDTH);
} else if (styleWidth->GetUnit() == eStyleUnit_Percent) {
// XXX This should use real percentage padding
nsIFrame::IntrinsicWidthOffsetData offsets =
cellFrame->IntrinsicWidthOffsets(aReflowState.rendContext);
nsIFrame::IntrinsicISizeOffsetData offsets =
cellFrame->IntrinsicISizeOffsets(aReflowState.rendContext);
float pct = styleWidth->GetPercentValue();
colWidth = NSToCoordFloor(pct * float(tableWidth));

2
layout/tables/FixedTableLayoutStrategy.h
View File

@ -27,7 +27,7 @@ public:
virtual nscoord GetMinISize(nsRenderingContext* aRenderingContext) MOZ_OVERRIDE;
virtual nscoord GetPrefISize(nsRenderingContext* aRenderingContext,
bool aComputingSize) MOZ_OVERRIDE;
virtual void MarkIntrinsicWidthsDirty() MOZ_OVERRIDE;
virtual void MarkIntrinsicISizesDirty() MOZ_OVERRIDE;
virtual void ComputeColumnWidths(const nsHTMLReflowState& aReflowState) MOZ_OVERRIDE;
private:

4
layout/tables/nsITableLayoutStrategy.h
View File

@ -30,8 +30,8 @@ public:
virtual nscoord GetPrefISize(nsRenderingContext* aRenderingContext,
bool aComputingSize) = 0;
/** Implement nsIFrame::MarkIntrinsicWidthsDirty for the table */
virtual void MarkIntrinsicWidthsDirty() = 0;
/** Implement nsIFrame::MarkIntrinsicISizesDirty for the table */
virtual void MarkIntrinsicISizesDirty() = 0;
/**
* Compute final column widths based on the intrinsic width data and

8
layout/tables/nsTableCellFrame.cpp
View File

@ -778,11 +778,11 @@ nsTableCellFrame::GetPrefISize(nsRenderingContext *aRenderingContext)
return result;
}
/* virtual */ nsIFrame::IntrinsicWidthOffsetData
nsTableCellFrame::IntrinsicWidthOffsets(nsRenderingContext* aRenderingContext)
/* virtual */ nsIFrame::IntrinsicISizeOffsetData
nsTableCellFrame::IntrinsicISizeOffsets(nsRenderingContext* aRenderingContext)
{
IntrinsicWidthOffsetData result =
nsContainerFrame::IntrinsicWidthOffsets(aRenderingContext);
IntrinsicISizeOffsetData result =
nsContainerFrame::IntrinsicISizeOffsets(aRenderingContext);
result.hMargin = 0;
result.hPctMargin = 0;

4
layout/tables/nsTableCellFrame.h
View File

@ -104,8 +104,8 @@ public:
virtual nscoord GetMinISize(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
virtual nscoord GetPrefISize(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
virtual IntrinsicWidthOffsetData
IntrinsicWidthOffsets(nsRenderingContext* aRenderingContext) MOZ_OVERRIDE;
virtual IntrinsicISizeOffsetData
IntrinsicISizeOffsets(nsRenderingContext* aRenderingContext) MOZ_OVERRIDE;
virtual void Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,

2
layout/tables/nsTableColFrame.h
View File

@ -286,7 +286,7 @@ protected:
float mSpanPrefPercent; // XXX...
// ...XXX the four members marked above could be allocated as part of
// a separate array allocated only during
// BasicTableLayoutStrategy::ComputeColumnIntrinsicWidths (and only
// BasicTableLayoutStrategy::ComputeColumnIntrinsicISizes (and only
// when colspans were present).
nscoord mFinalWidth;

14
layout/tables/nsTableFrame.cpp
View File

@ -1484,7 +1484,7 @@ nsTableFrame::ProcessRowInserted(nscoord aNewHeight)
}
/* virtual */ void
nsTableFrame::MarkIntrinsicWidthsDirty()
nsTableFrame::MarkIntrinsicISizesDirty()
{
nsITableLayoutStrategy* tls = LayoutStrategy();
if (MOZ_UNLIKELY(!tls)) {
@ -1496,11 +1496,11 @@ nsTableFrame::MarkIntrinsicWidthsDirty()
// destroyed so no need to mark anything dirty here. See bug 595758.
return;
}
tls->MarkIntrinsicWidthsDirty();
tls->MarkIntrinsicISizesDirty();
// XXXldb Call SetBCDamageArea?
nsContainerFrame::MarkIntrinsicWidthsDirty();
nsContainerFrame::MarkIntrinsicISizesDirty();
}
/* virtual */ nscoord
@ -1525,11 +1525,11 @@ nsTableFrame::GetPrefISize(nsRenderingContext *aRenderingContext)
return LayoutStrategy()->GetPrefISize(aRenderingContext, false);
}
/* virtual */ nsIFrame::IntrinsicWidthOffsetData
nsTableFrame::IntrinsicWidthOffsets(nsRenderingContext* aRenderingContext)
/* virtual */ nsIFrame::IntrinsicISizeOffsetData
nsTableFrame::IntrinsicISizeOffsets(nsRenderingContext* aRenderingContext)
{
IntrinsicWidthOffsetData result =
nsContainerFrame::IntrinsicWidthOffsets(aRenderingContext);
IntrinsicISizeOffsetData result =
nsContainerFrame::IntrinsicISizeOffsets(aRenderingContext);
result.hMargin = 0;
result.hPctMargin = 0;

6
layout/tables/nsTableFrame.h
View File

@ -295,13 +295,13 @@ public:
void PaintBCBorders(nsRenderingContext& aRenderingContext,
const nsRect& aDirtyRect);
virtual void MarkIntrinsicWidthsDirty() MOZ_OVERRIDE;
virtual void MarkIntrinsicISizesDirty() MOZ_OVERRIDE;
// For border-collapse tables, the caller must not add padding and
// border to the results of these functions.
virtual nscoord GetMinISize(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
virtual nscoord GetPrefISize(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
virtual IntrinsicWidthOffsetData
IntrinsicWidthOffsets(nsRenderingContext* aRenderingContext) MOZ_OVERRIDE;
virtual IntrinsicISizeOffsetData
IntrinsicISizeOffsets(nsRenderingContext* aRenderingContext) MOZ_OVERRIDE;
virtual nsSize ComputeSize(nsRenderingContext *aRenderingContext,
nsSize aCBSize, nscoord aAvailableWidth,

2
layout/tables/nsTableOuterFrame.cpp
View File

@ -438,7 +438,7 @@ nsTableOuterFrame::GetPrefISize(nsRenderingContext *aRenderingContext)
break;
default:
{
nsLayoutUtils::IntrinsicWidthType iwt;
nsLayoutUtils::IntrinsicISizeType iwt;
if (captionSide == NS_STYLE_CAPTION_SIDE_TOP ||
captionSide == NS_STYLE_CAPTION_SIDE_BOTTOM) {
// Don't let the caption's pref width expand the table's pref

4
layout/xul/grid/nsGridLayout2.cpp
View File

@ -61,9 +61,9 @@ nsGridLayout2::Layout(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState)
}
void
nsGridLayout2::IntrinsicWidthsDirty(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState)
nsGridLayout2::IntrinsicISizesDirty(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState)
{
nsStackLayout::IntrinsicWidthsDirty(aBox, aBoxLayoutState);
nsStackLayout::IntrinsicISizesDirty(aBox, aBoxLayoutState);
// XXXldb We really don't need to do all the work that NeedsRebuild
// does; we just need to mark intrinsic widths dirty on the
// (row/column)(s/-groups).

2
layout/xul/grid/nsGridLayout2.h
View File

@ -33,7 +33,7 @@ public:
NS_DECL_ISUPPORTS_INHERITED
NS_IMETHOD Layout(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
virtual void IntrinsicWidthsDirty(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
virtual void IntrinsicISizesDirty(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
virtual nsGridRowGroupLayout* CastToRowGroupLayout() MOZ_OVERRIDE { return nullptr; }
virtual nsGridLayout2* CastToGridLayout() MOZ_OVERRIDE { return this; }

2
layout/xul/grid/nsGridRowGroupLayout.cpp
View File

@ -154,7 +154,7 @@ nsGridRowGroupLayout::DirtyRows(nsIFrame* aBox, nsBoxLayoutState& aState)
if (aBox) {
// mark us dirty
// XXXldb We probably don't want to walk up the ancestor chain
// calling MarkIntrinsicWidthsDirty for every row group.
// calling MarkIntrinsicISizesDirty for every row group.
aState.PresShell()->FrameNeedsReflow(aBox, nsIPresShell::eTreeChange,
NS_FRAME_IS_DIRTY);
nsIFrame* child = nsBox::GetChildBox(aBox);

2
layout/xul/grid/nsGridRowLeafLayout.cpp
View File

@ -289,7 +289,7 @@ nsGridRowLeafLayout::DirtyRows(nsIFrame* aBox, nsBoxLayoutState& aState)
if (aBox) {
// mark us dirty
// XXXldb We probably don't want to walk up the ancestor chain
// calling MarkIntrinsicWidthsDirty for every row.
// calling MarkIntrinsicISizesDirty for every row.
aState.PresShell()->FrameNeedsReflow(aBox, nsIPresShell::eTreeChange,
NS_FRAME_IS_DIRTY);
}

8
layout/xul/nsBoxFrame.cpp
View File

@ -174,7 +174,7 @@ nsBoxFrame::Init(nsIContent* aContent,
AddStateBits(NS_FRAME_FONT_INFLATION_FLOW_ROOT);
}
MarkIntrinsicWidthsDirty();
MarkIntrinsicISizesDirty();
CacheAttributes();
@ -973,7 +973,7 @@ nsBoxFrame::SetDebug(nsBoxLayoutState& aState, bool aDebug)
SetDebugOnChildList(aState, mFirstChild, aDebug);
MarkIntrinsicWidthsDirty();
MarkIntrinsicISizesDirty();
}
return NS_OK;
@ -981,7 +981,7 @@ nsBoxFrame::SetDebug(nsBoxLayoutState& aState, bool aDebug)
#endif
/* virtual */ void
nsBoxFrame::MarkIntrinsicWidthsDirty()
nsBoxFrame::MarkIntrinsicISizesDirty()
{
SizeNeedsRecalc(mPrefSize);
SizeNeedsRecalc(mMinSize);
@ -991,7 +991,7 @@ nsBoxFrame::MarkIntrinsicWidthsDirty()
if (mLayoutManager) {
nsBoxLayoutState state(PresContext());
mLayoutManager->IntrinsicWidthsDirty(this, state);
mLayoutManager->IntrinsicISizesDirty(this, state);
}
// Don't call base class method, since everything it does is within an

2
layout/xul/nsBoxFrame.h
View File

@ -80,7 +80,7 @@ public:
nsIAtom* aAttribute,
int32_t aModType) MOZ_OVERRIDE;
virtual void MarkIntrinsicWidthsDirty() MOZ_OVERRIDE;
virtual void MarkIntrinsicISizesDirty() MOZ_OVERRIDE;
virtual nscoord GetMinISize(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
virtual nscoord GetPrefISize(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;

2
layout/xul/nsBoxLayout.h
View File

@ -47,7 +47,7 @@ public:
const nsFrameList::Slice& aNewChildren) {}
virtual void ChildrenRemoved(nsIFrame* aBox, nsBoxLayoutState& aState, nsIFrame* aChildList) {}
virtual void ChildrenSet(nsIFrame* aBox, nsBoxLayoutState& aState, nsIFrame* aChildList) {}
virtual void IntrinsicWidthsDirty(nsIFrame* aBox, nsBoxLayoutState& aState) {}
virtual void IntrinsicISizesDirty(nsIFrame* aBox, nsBoxLayoutState& aState) {}
virtual void AddBorderAndPadding(nsIFrame* aBox, nsSize& aSize);
virtual void AddMargin(nsIFrame* aChild, nsSize& aSize);

6
layout/xul/nsImageBoxFrame.cpp
View File

@ -149,7 +149,7 @@ nsImageBoxFrame::nsImageBoxFrame(nsIPresShell* aShell, nsStyleContext* aContext)
mSuppressStyleCheck(false),
mFireEventOnDecode(false)
{
MarkIntrinsicWidthsDirty();
MarkIntrinsicISizesDirty();
}
nsImageBoxFrame::~nsImageBoxFrame()
@ -158,10 +158,10 @@ nsImageBoxFrame::~nsImageBoxFrame()
/* virtual */ void
nsImageBoxFrame::MarkIntrinsicWidthsDirty()
nsImageBoxFrame::MarkIntrinsicISizesDirty()
{
SizeNeedsRecalc(mImageSize);
nsLeafBoxFrame::MarkIntrinsicWidthsDirty();
nsLeafBoxFrame::MarkIntrinsicISizesDirty();
}
void

2
layout/xul/nsImageBoxFrame.h
View File

@ -48,7 +48,7 @@ public:
virtual nsSize GetPrefSize(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
virtual nsSize GetMinSize(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
virtual nscoord GetBoxAscent(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
virtual void MarkIntrinsicWidthsDirty() MOZ_OVERRIDE;
virtual void MarkIntrinsicISizesDirty() MOZ_OVERRIDE;
nsresult Notify(imgIRequest *aRequest, int32_t aType, const nsIntRect* aData);

6
layout/xul/nsLeafBoxFrame.cpp
View File

@ -162,7 +162,7 @@ nsLeafBoxFrame::GetPrefISize(nsRenderingContext *aRenderingContext)
}
nscoord
nsLeafBoxFrame::GetIntrinsicWidth()
nsLeafBoxFrame::GetIntrinsicISize()
{
// No intrinsic width
return 0;
@ -330,7 +330,7 @@ nsLeafBoxFrame::GetType() const
nsresult
nsLeafBoxFrame::CharacterDataChanged(CharacterDataChangeInfo* aInfo)
{
MarkIntrinsicWidthsDirty();
MarkIntrinsicISizesDirty();
return nsLeafFrame::CharacterDataChanged(aInfo);
}
@ -365,7 +365,7 @@ nsLeafBoxFrame::GetBoxAscent(nsBoxLayoutState& aState)
}
/* virtual */ void
nsLeafBoxFrame::MarkIntrinsicWidthsDirty()
nsLeafBoxFrame::MarkIntrinsicISizesDirty()
{
// Don't call base class method, since everything it does is within an
// IsBoxWrapped check.

4
layout/xul/nsLeafBoxFrame.h
View File

@ -39,7 +39,7 @@ public:
// nsIHTMLReflow overrides
virtual void MarkIntrinsicWidthsDirty() MOZ_OVERRIDE;
virtual void MarkIntrinsicISizesDirty() MOZ_OVERRIDE;
virtual nscoord GetMinISize(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
virtual nscoord GetPrefISize(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
@ -78,7 +78,7 @@ protected:
virtual void GetBoxName(nsAutoString& aName) MOZ_OVERRIDE;
#endif
virtual nscoord GetIntrinsicWidth() MOZ_OVERRIDE;
virtual nscoord GetIntrinsicISize() MOZ_OVERRIDE;
nsLeafBoxFrame(nsIPresShell* aShell, nsStyleContext* aContext);

6
layout/xul/nsListBoxBodyFrame.cpp
View File

@ -239,10 +239,10 @@ nsListBoxBodyFrame::AttributeChanged(int32_t aNameSpaceID,
}
/* virtual */ void
nsListBoxBodyFrame::MarkIntrinsicWidthsDirty()
nsListBoxBodyFrame::MarkIntrinsicISizesDirty()
{
mStringWidth = -1;
nsBoxFrame::MarkIntrinsicWidthsDirty();
nsBoxFrame::MarkIntrinsicISizesDirty();
}
/////////// nsBox ///////////////
@ -643,7 +643,7 @@ nsListBoxBodyFrame::GetYPosition()
}
nscoord
nsListBoxBodyFrame::ComputeIntrinsicWidth(nsBoxLayoutState& aBoxLayoutState)
nsListBoxBodyFrame::ComputeIntrinsicISize(nsBoxLayoutState& aBoxLayoutState)
{
if (mStringWidth != -1)
return mStringWidth;

4
layout/xul/nsListBoxBodyFrame.h
View File

@ -65,7 +65,7 @@ public:
virtual void ReflowCallbackCanceled() MOZ_OVERRIDE;
NS_IMETHOD DoLayout(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
virtual void MarkIntrinsicWidthsDirty() MOZ_OVERRIDE;
virtual void MarkIntrinsicISizesDirty() MOZ_OVERRIDE;
virtual nsSize GetMinSizeForScrollArea(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
virtual nsSize GetPrefSize(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
@ -77,7 +77,7 @@ public:
void SetRowHeight(nscoord aRowHeight);
nscoord GetYPosition();
nscoord GetAvailableHeight();
nscoord ComputeIntrinsicWidth(nsBoxLayoutState& aBoxLayoutState);
nscoord ComputeIntrinsicISize(nsBoxLayoutState& aBoxLayoutState);
// scrolling
nsresult InternalPositionChangedCallback();

4
layout/xul/nsListBoxLayout.cpp
View File

@ -38,7 +38,7 @@ nsListBoxLayout::GetPrefSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState)
}
if (nsContentUtils::HasNonEmptyAttr(frame->GetContent(), kNameSpaceID_None,
nsGkAtoms::sizemode)) {
nscoord width = frame->ComputeIntrinsicWidth(aBoxLayoutState);
nscoord width = frame->ComputeIntrinsicISize(aBoxLayoutState);
if (width > pref.width)
pref.width = width;
}
@ -64,7 +64,7 @@ nsListBoxLayout::GetMinSize(nsIFrame* aBox, nsBoxLayoutState& aBoxLayoutState)
}
if (nsContentUtils::HasNonEmptyAttr(frame->GetContent(), kNameSpaceID_None,
nsGkAtoms::sizemode)) {
nscoord width = frame->ComputeIntrinsicWidth(aBoxLayoutState);
nscoord width = frame->ComputeIntrinsicISize(aBoxLayoutState);
if (width > minSize.width)
minSize.width = width;
}

6
layout/xul/nsTextBoxFrame.cpp
View File

@ -97,7 +97,7 @@ nsTextBoxFrame::nsTextBoxFrame(nsIPresShell* aShell, nsStyleContext* aContext):
nsLeafBoxFrame(aShell, aContext), mAccessKeyInfo(nullptr), mCropType(CropRight),
mNeedsReflowCallback(false)
{
MarkIntrinsicWidthsDirty();
MarkIntrinsicISizesDirty();
}
nsTextBoxFrame::~nsTextBoxFrame()
@ -973,10 +973,10 @@ nsTextBoxFrame::ComputesOwnOverflowArea()
}
/* virtual */ void
nsTextBoxFrame::MarkIntrinsicWidthsDirty()
nsTextBoxFrame::MarkIntrinsicISizesDirty()
{
mNeedsRecalc = true;
nsTextBoxFrameSuper::MarkIntrinsicWidthsDirty();
nsTextBoxFrameSuper::MarkIntrinsicISizesDirty();
}
void

2
layout/xul/nsTextBoxFrame.h
View File

@ -23,7 +23,7 @@ public:
virtual nsSize GetMinSize(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
virtual nscoord GetBoxAscent(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
NS_IMETHOD DoLayout(nsBoxLayoutState& aBoxLayoutState) MOZ_OVERRIDE;
virtual void MarkIntrinsicWidthsDirty() MOZ_OVERRIDE;
virtual void MarkIntrinsicISizesDirty() MOZ_OVERRIDE;
enum CroppingStyle { CropNone, CropLeft, CropRight, CropCenter };