summaryrefslogtreecommitdiffstats
path: root/layout/generic/ReflowInput.cpp
diff options
context:
space:
mode:
authorjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-07-20 09:15:48 +0200
committerjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-07-20 09:15:48 +0200
commit1b153b3f2a70b65fffe6e5a70616681b7aa3ecb6 (patch)
tree44dc881e9aa9f116c7eb77a1c65766e428acc48d /layout/generic/ReflowInput.cpp
parent83459c927715bd6d2be1e339ff723b4feb3e5fe7 (diff)
downloadUXP-1b153b3f2a70b65fffe6e5a70616681b7aa3ecb6.tar
UXP-1b153b3f2a70b65fffe6e5a70616681b7aa3ecb6.tar.gz
UXP-1b153b3f2a70b65fffe6e5a70616681b7aa3ecb6.tar.lz
UXP-1b153b3f2a70b65fffe6e5a70616681b7aa3ecb6.tar.xz
UXP-1b153b3f2a70b65fffe6e5a70616681b7aa3ecb6.zip
Bug 958714 Remove obsolete assertion & comment
+ Used "mFrame->GetType()" instead of "mFrame->Type()"
Diffstat (limited to 'layout/generic/ReflowInput.cpp')
-rw-r--r--layout/generic/ReflowInput.cpp13
1 files changed, 1 insertions, 12 deletions
diff --git a/layout/generic/ReflowInput.cpp b/layout/generic/ReflowInput.cpp
index 04f4ef3e5..bbff77ad4 100644
--- a/layout/generic/ReflowInput.cpp
+++ b/layout/generic/ReflowInput.cpp
@@ -154,11 +154,6 @@ FontSizeInflationListMarginAdjustment(const nsIFrame* aFrame)
return 0;
}
-// NOTE: If we ever want to use SizeComputationInput for a flex item or a
-// grid item, we need to make it take the containing-block block-size as
-// well as the inline-size, since flex items and grid items resolve
-// block-direction percent margins and padding against the
-// containing-block block-size, rather than its inline-size.
SizeComputationInput::SizeComputationInput(nsIFrame *aFrame,
nsRenderingContext *aRenderingContext,
WritingMode aContainingBlockWritingMode,
@@ -167,15 +162,9 @@ SizeComputationInput::SizeComputationInput(nsIFrame *aFrame,
, mRenderingContext(aRenderingContext)
, mWritingMode(aFrame->GetWritingMode())
{
- MOZ_ASSERT(!aFrame->IsFlexOrGridItem(),
- "We're about to resolve percent margin & padding "
- "values against CB inline size, which is incorrect for "
- "flex/grid items. "
- "Additionally for grid items, this path doesn't handle baseline "
- "padding contribution - see SizeComputationInput::InitOffsets");
ReflowInputFlags flags;
InitOffsets(aContainingBlockWritingMode, aContainingBlockISize,
- mFrame->Type(), flags);
+ mFrame->GetType(), flags);
}
// Initialize a reflow state for a child frame's reflow. Some state