summaryrefslogtreecommitdiff
path: root/layout/forms
diff options
context:
space:
mode:
Diffstat (limited to 'layout/forms')
-rw-r--r--layout/forms/nsComboboxControlFrame.cpp8
-rw-r--r--layout/forms/nsDateTimeControlFrame.cpp7
-rw-r--r--layout/forms/nsFieldSetFrame.cpp14
-rw-r--r--layout/forms/nsHTMLButtonControlFrame.cpp9
-rw-r--r--layout/forms/nsMeterFrame.cpp4
-rw-r--r--layout/forms/nsNumberControlFrame.cpp8
-rw-r--r--layout/forms/nsProgressFrame.cpp4
-rw-r--r--layout/forms/nsRangeFrame.cpp23
-rw-r--r--layout/forms/nsTextControlFrame.cpp8
9 files changed, 44 insertions, 41 deletions
diff --git a/layout/forms/nsComboboxControlFrame.cpp b/layout/forms/nsComboboxControlFrame.cpp
index 9db6ae5e45..459c6f7ecc 100644
--- a/layout/forms/nsComboboxControlFrame.cpp
+++ b/layout/forms/nsComboboxControlFrame.cpp
@@ -460,10 +460,10 @@ nsComboboxControlFrame::ReflowDropdown(nsPresContext* aPresContext,
// Allow the child to move/size/change-visibility its view if it's currently
// dropped down
- int32_t flags = mDroppedDown ? 0
- : NS_FRAME_NO_MOVE_FRAME |
- NS_FRAME_NO_VISIBILITY |
- NS_FRAME_NO_SIZE_VIEW;
+ ReflowChildFlags flags = mDroppedDown ? ReflowChildFlags::Default
+ : ReflowChildFlags::NoMoveFrame |
+ ReflowChildFlags::NoVisibility |
+ ReflowChildFlags::NoSizeView;
//XXX Can this be different from the dropdown's writing mode?
// That would be odd!
diff --git a/layout/forms/nsDateTimeControlFrame.cpp b/layout/forms/nsDateTimeControlFrame.cpp
index fa22dcebac..145a2d4724 100644
--- a/layout/forms/nsDateTimeControlFrame.cpp
+++ b/layout/forms/nsDateTimeControlFrame.cpp
@@ -233,8 +233,8 @@ nsDateTimeControlFrame::Reflow(nsPresContext* aPresContext,
// will be fixed later.
const nsSize dummyContainerSize;
ReflowChild(inputAreaFrame, aPresContext, childDesiredSize,
- childReflowOuput, myWM, childOffset, dummyContainerSize, 0,
- childStatus);
+ childReflowOuput, myWM, childOffset, dummyContainerSize,
+ ReflowChildFlags::Default, childStatus);
MOZ_ASSERT(NS_FRAME_IS_FULLY_COMPLETE(childStatus),
"We gave our child unconstrained available block-size, "
"so it should be complete");
@@ -271,7 +271,8 @@ nsDateTimeControlFrame::Reflow(nsPresContext* aPresContext,
// Place the child
FinishReflowChild(inputAreaFrame, aPresContext, childDesiredSize,
- &childReflowOuput, myWM, childOffset, borderBoxSize, 0);
+ &childReflowOuput, myWM, childOffset, borderBoxSize,
+ ReflowChildFlags::Default);
nsSize contentBoxSize =
LogicalSize(myWM, contentBoxISize, contentBoxBSize).
diff --git a/layout/forms/nsFieldSetFrame.cpp b/layout/forms/nsFieldSetFrame.cpp
index a5177560de..ce66f5d0f1 100644
--- a/layout/forms/nsFieldSetFrame.cpp
+++ b/layout/forms/nsFieldSetFrame.cpp
@@ -397,8 +397,8 @@ nsFieldSetFrame::Reflow(nsPresContext* aPresContext,
nsOverflowAreas ocBounds;
nsReflowStatus ocStatus = NS_FRAME_COMPLETE;
if (GetPrevInFlow()) {
- ReflowOverflowContainerChildren(aPresContext, aReflowInput, ocBounds, 0,
- ocStatus);
+ ReflowOverflowContainerChildren(aPresContext, aReflowInput, ocBounds,
+ ReflowChildFlags::Default, ocStatus);
}
//------------ Handle Incremental Reflow -----------------
@@ -459,7 +459,7 @@ nsFieldSetFrame::Reflow(nsPresContext* aPresContext,
const nsSize dummyContainerSize;
ReflowChild(legend, aPresContext, legendDesiredSize, *legendReflowInput,
wm, LogicalPoint(wm), dummyContainerSize,
- NS_FRAME_NO_MOVE_FRAME, aStatus);
+ ReflowChildFlags::NoMoveFrame, aStatus);
#ifdef NOISY_REFLOW
printf(" returned (%d, %d)\n",
legendDesiredSize.Width(), legendDesiredSize.Height());
@@ -488,7 +488,7 @@ nsFieldSetFrame::Reflow(nsPresContext* aPresContext,
FinishReflowChild(legend, aPresContext, legendDesiredSize,
legendReflowInput.ptr(), wm, LogicalPoint(wm),
- dummyContainerSize, NS_FRAME_NO_MOVE_FRAME);
+ dummyContainerSize, ReflowChildFlags::NoMoveFrame);
} else if (!legend) {
mLegendRect.SetEmpty();
mLegendSpace = 0;
@@ -540,13 +540,13 @@ nsFieldSetFrame::Reflow(nsPresContext* aPresContext,
// if necessary.
const nsSize dummyContainerSize;
ReflowChild(inner, aPresContext, kidDesiredSize, kidReflowInput,
- wm, pt, dummyContainerSize, 0, aStatus);
+ wm, pt, dummyContainerSize, ReflowChildFlags::Default, aStatus);
// Update containerSize to account for size of the inner frame, so that
// FinishReflowChild can position it correctly.
containerSize += kidDesiredSize.PhysicalSize();
- FinishReflowChild(inner, aPresContext, kidDesiredSize,
- &kidReflowInput, wm, pt, containerSize, 0);
+ FinishReflowChild(inner, aPresContext, kidDesiredSize, &kidReflowInput, wm,
+ pt, containerSize, ReflowChildFlags::Default);
NS_FRAME_TRACE_REFLOW_OUT("FieldSet::Reflow", aStatus);
} else if (inner) {
// |inner| didn't need to be reflowed but we do need to include its size
diff --git a/layout/forms/nsHTMLButtonControlFrame.cpp b/layout/forms/nsHTMLButtonControlFrame.cpp
index 495686cfc7..afedfa7748 100644
--- a/layout/forms/nsHTMLButtonControlFrame.cpp
+++ b/layout/forms/nsHTMLButtonControlFrame.cpp
@@ -333,7 +333,8 @@ nsHTMLButtonControlFrame::ReflowButtonContents(nsPresContext* aPresContext,
nsSize dummyContainerSize;
ReflowChild(aFirstKid, aPresContext,
contentsDesiredSize, contentsReflowInput,
- wm, childPos, dummyContainerSize, 0, contentsReflowStatus);
+ wm, childPos, dummyContainerSize, ReflowChildFlags::Default,
+ contentsReflowStatus);
MOZ_ASSERT(NS_FRAME_IS_COMPLETE(contentsReflowStatus),
"We gave button-contents frame unconstrained available height, "
"so it should be complete");
@@ -386,9 +387,9 @@ nsHTMLButtonControlFrame::ReflowButtonContents(nsPresContext* aPresContext,
(buttonContentBox + clbp.Size(wm)).GetPhysicalSize(wm);
// Place the child
- FinishReflowChild(aFirstKid, aPresContext,
- contentsDesiredSize, &contentsReflowInput,
- wm, childPos, containerSize, 0);
+ FinishReflowChild(aFirstKid, aPresContext, contentsDesiredSize,
+ &contentsReflowInput, wm, childPos, containerSize,
+ ReflowChildFlags::Default);
// Make sure we have a useful 'ascent' value for the child
if (contentsDesiredSize.BlockStartAscent() ==
diff --git a/layout/forms/nsMeterFrame.cpp b/layout/forms/nsMeterFrame.cpp
index 6ef362820f..e90bbb4667 100644
--- a/layout/forms/nsMeterFrame.cpp
+++ b/layout/forms/nsMeterFrame.cpp
@@ -187,9 +187,9 @@ nsMeterFrame::ReflowBarFrame(nsIFrame* aBarFrame,
ReflowOutput barDesiredSize(reflowInput);
ReflowChild(aBarFrame, aPresContext, barDesiredSize, reflowInput, xoffset,
- yoffset, 0, aStatus);
+ yoffset, ReflowChildFlags::Default, aStatus);
FinishReflowChild(aBarFrame, aPresContext, barDesiredSize, &reflowInput,
- xoffset, yoffset, 0);
+ xoffset, yoffset, ReflowChildFlags::Default);
}
nsresult
diff --git a/layout/forms/nsNumberControlFrame.cpp b/layout/forms/nsNumberControlFrame.cpp
index 64e3df0fe3..3e625d39af 100644
--- a/layout/forms/nsNumberControlFrame.cpp
+++ b/layout/forms/nsNumberControlFrame.cpp
@@ -181,8 +181,8 @@ nsNumberControlFrame::Reflow(nsPresContext* aPresContext,
// will be fixed later.
const nsSize dummyContainerSize;
ReflowChild(outerWrapperFrame, aPresContext, wrappersDesiredSize,
- wrapperReflowInput, myWM, wrapperOffset, dummyContainerSize, 0,
- childStatus);
+ wrapperReflowInput, myWM, wrapperOffset, dummyContainerSize,
+ ReflowChildFlags::Default, childStatus);
MOZ_ASSERT(NS_FRAME_IS_FULLY_COMPLETE(childStatus),
"We gave our child unconstrained available block-size, "
"so it should be complete");
@@ -219,8 +219,8 @@ nsNumberControlFrame::Reflow(nsPresContext* aPresContext,
// Place the child
FinishReflowChild(outerWrapperFrame, aPresContext, wrappersDesiredSize,
- &wrapperReflowInput, myWM, wrapperOffset,
- borderBoxSize, 0);
+ &wrapperReflowInput, myWM, wrapperOffset, borderBoxSize,
+ ReflowChildFlags::Default);
nsSize contentBoxSize =
LogicalSize(myWM, contentBoxISize, contentBoxBSize).
diff --git a/layout/forms/nsProgressFrame.cpp b/layout/forms/nsProgressFrame.cpp
index 60c7abe42c..c734787d24 100644
--- a/layout/forms/nsProgressFrame.cpp
+++ b/layout/forms/nsProgressFrame.cpp
@@ -203,9 +203,9 @@ nsProgressFrame::ReflowChildFrame(nsIFrame* aChild,
ReflowOutput barDesiredSize(aReflowInput);
ReflowChild(aChild, aPresContext, barDesiredSize, reflowInput, xoffset,
- yoffset, 0, aStatus);
+ yoffset, ReflowChildFlags::Default, aStatus);
FinishReflowChild(aChild, aPresContext, barDesiredSize, &reflowInput,
- xoffset, yoffset, 0);
+ xoffset, yoffset, ReflowChildFlags::Default);
}
nsresult
diff --git a/layout/forms/nsRangeFrame.cpp b/layout/forms/nsRangeFrame.cpp
index f1755e69fa..7ed05a21c4 100644
--- a/layout/forms/nsRangeFrame.cpp
+++ b/layout/forms/nsRangeFrame.cpp
@@ -415,12 +415,13 @@ nsRangeFrame::ReflowAnonymousContent(nsPresContext* aPresContext,
nsReflowStatus frameStatus;
ReflowOutput trackDesiredSize(aReflowInput);
- ReflowChild(trackFrame, aPresContext, trackDesiredSize,
- trackReflowInput, trackX, trackY, 0, frameStatus);
+ ReflowChild(trackFrame, aPresContext, trackDesiredSize, trackReflowInput,
+ trackX, trackY, ReflowChildFlags::Default, frameStatus);
MOZ_ASSERT(NS_FRAME_IS_FULLY_COMPLETE(frameStatus),
"We gave our child unconstrained height, so it should be complete");
FinishReflowChild(trackFrame, aPresContext, trackDesiredSize,
- &trackReflowInput, trackX, trackY, 0);
+ &trackReflowInput, trackX, trackY,
+ ReflowChildFlags::Default);
}
nsIFrame* thumbFrame = mThumbDiv->GetPrimaryFrame();
@@ -437,12 +438,12 @@ nsRangeFrame::ReflowAnonymousContent(nsPresContext* aPresContext,
nsReflowStatus frameStatus;
ReflowOutput thumbDesiredSize(aReflowInput);
- ReflowChild(thumbFrame, aPresContext, thumbDesiredSize,
- thumbReflowInput, 0, 0, 0, frameStatus);
+ ReflowChild(thumbFrame, aPresContext, thumbDesiredSize, thumbReflowInput, 0,
+ 0, ReflowChildFlags::Default, frameStatus);
MOZ_ASSERT(NS_FRAME_IS_FULLY_COMPLETE(frameStatus),
"We gave our child unconstrained height, so it should be complete");
FinishReflowChild(thumbFrame, aPresContext, thumbDesiredSize,
- &thumbReflowInput, 0, 0, 0);
+ &thumbReflowInput, 0, 0, ReflowChildFlags::Default);
DoUpdateThumbPosition(thumbFrame, nsSize(aDesiredSize.Width(),
aDesiredSize.Height()));
}
@@ -462,13 +463,13 @@ nsRangeFrame::ReflowAnonymousContent(nsPresContext* aPresContext,
nsReflowStatus frameStatus;
ReflowOutput progressDesiredSize(aReflowInput);
- ReflowChild(rangeProgressFrame, aPresContext,
- progressDesiredSize, progressReflowInput, 0, 0,
- 0, frameStatus);
+ ReflowChild(rangeProgressFrame, aPresContext, progressDesiredSize,
+ progressReflowInput, 0, 0, ReflowChildFlags::Default,
+ frameStatus);
MOZ_ASSERT(NS_FRAME_IS_FULLY_COMPLETE(frameStatus),
"We gave our child unconstrained height, so it should be complete");
- FinishReflowChild(rangeProgressFrame, aPresContext,
- progressDesiredSize, &progressReflowInput, 0, 0, 0);
+ FinishReflowChild(rangeProgressFrame, aPresContext, progressDesiredSize,
+ &progressReflowInput, 0, 0, ReflowChildFlags::Default);
DoUpdateRangeProgressFrame(rangeProgressFrame, nsSize(aDesiredSize.Width(),
aDesiredSize.Height()));
}
diff --git a/layout/forms/nsTextControlFrame.cpp b/layout/forms/nsTextControlFrame.cpp
index 7e610f9313..ca55cf629c 100644
--- a/layout/forms/nsTextControlFrame.cpp
+++ b/layout/forms/nsTextControlFrame.cpp
@@ -581,12 +581,12 @@ nsTextControlFrame::ReflowTextControlChild(nsIFrame* aKid,
// reflow the child
ReflowOutput desiredSize(aReflowInput);
- ReflowChild(aKid, aPresContext, desiredSize, kidReflowInput,
- xOffset, yOffset, 0, aStatus);
+ ReflowChild(aKid, aPresContext, desiredSize, kidReflowInput, xOffset, yOffset,
+ ReflowChildFlags::Default, aStatus);
// place the child
- FinishReflowChild(aKid, aPresContext, desiredSize,
- &kidReflowInput, xOffset, yOffset, 0);
+ FinishReflowChild(aKid, aPresContext, desiredSize, &kidReflowInput, xOffset,
+ yOffset, ReflowChildFlags::Default);
// consider the overflow
aParentDesiredSize.mOverflowAreas.UnionWith(desiredSize.mOverflowAreas);
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-14 22:34:33 +0000