зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1577745 - Remove dead version of nsStyleDisplay::IsOriginalDisplayInlineOutside. r=mats
SVG Text stuff doesn't support abspos or anything like that, so it's not like it is useful. Differential Revision: https://phabricator.services.mozilla.com/D44136 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
a695bb9ded
Коммит
e789ad73c7
|
@ -1409,7 +1409,7 @@ void ReflowInput::CalculateHypotheticalPosition(
|
|||
// would have been inline-level or block-level
|
||||
LogicalRect lineBounds = lineBox->GetBounds().ConvertTo(
|
||||
wm, lineBox->mWritingMode, lineBox->mContainerSize);
|
||||
if (mStyleDisplay->IsOriginalDisplayInlineOutsideStyle()) {
|
||||
if (mStyleDisplay->IsOriginalDisplayInlineOutside()) {
|
||||
// Use the block-start of the inline box which the placeholder lives in
|
||||
// as the hypothetical box's block-start.
|
||||
aHypotheticalPos.mBStart = lineBounds.BStart(wm) + blockOffset.B(wm);
|
||||
|
@ -1476,7 +1476,7 @@ void ReflowInput::CalculateHypotheticalPosition(
|
|||
// Second, determine the hypothetical box's mIStart.
|
||||
// How we determine the hypothetical box depends on whether the element
|
||||
// would have been inline-level or block-level
|
||||
if (mStyleDisplay->IsOriginalDisplayInlineOutsideStyle() ||
|
||||
if (mStyleDisplay->IsOriginalDisplayInlineOutside() ||
|
||||
mFlags.mIOffsetsNeedCSSAlign) {
|
||||
// The placeholder represents the IStart edge of the hypothetical box.
|
||||
// (Or if mFlags.mIOffsetsNeedCSSAlign is set, it represents the IStart
|
||||
|
|
|
@ -1664,7 +1664,7 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleDisplay {
|
|||
return IsDisplayTypeInlineOutside(mDisplay);
|
||||
}
|
||||
|
||||
bool IsOriginalDisplayInlineOutsideStyle() const {
|
||||
bool IsOriginalDisplayInlineOutside() const {
|
||||
return IsDisplayTypeInlineOutside(mOriginalDisplay);
|
||||
}
|
||||
|
||||
|
@ -1806,8 +1806,6 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleDisplay {
|
|||
// SVG text.
|
||||
inline bool IsBlockOutside(const nsIFrame* aContextFrame) const;
|
||||
inline bool IsInlineOutside(const nsIFrame* aContextFrame) const;
|
||||
inline bool IsOriginalDisplayInlineOutside(
|
||||
const nsIFrame* aContextFrame) const;
|
||||
inline mozilla::StyleDisplay GetDisplay(const nsIFrame* aContextFrame) const;
|
||||
inline bool IsFloating(const nsIFrame* aContextFrame) const;
|
||||
inline bool IsRelativelyPositioned(const nsIFrame* aContextFrame) const;
|
||||
|
|
|
@ -72,16 +72,6 @@ bool nsStyleDisplay::IsInlineOutside(const nsIFrame* aContextFrame) const {
|
|||
return IsInlineOutsideStyle();
|
||||
}
|
||||
|
||||
bool nsStyleDisplay::IsOriginalDisplayInlineOutside(
|
||||
const nsIFrame* aContextFrame) const {
|
||||
NS_ASSERTION(aContextFrame->StyleDisplay() == this,
|
||||
"unexpected aContextFrame");
|
||||
if (nsSVGUtils::IsInSVGTextSubtree(aContextFrame)) {
|
||||
return !aContextFrame->IsBlockFrame();
|
||||
}
|
||||
return IsOriginalDisplayInlineOutsideStyle();
|
||||
}
|
||||
|
||||
mozilla::StyleDisplay nsStyleDisplay::GetDisplay(
|
||||
const nsIFrame* aContextFrame) const {
|
||||
NS_ASSERTION(aContextFrame->StyleDisplay() == this,
|
||||
|
|
Загрузка…
Ссылка в новой задаче