Bug 1294918 - Fix spelling of method name nsIFrame::IsAbsPosContainingBlock. r?dholbert
This misspelling was introduced in
bug 1125767, changeset b9951cca6d1f.
MozReview-Commit-ID: KQNlLelY2Kn
--- a/dom/html/nsGenericHTMLElement.cpp
+++ b/dom/html/nsGenericHTMLElement.cpp
@@ -281,25 +281,25 @@ nsGenericHTMLElement::GetOffsetRect(CSSI
Element* docElement = GetComposedDoc()->GetRootElement();
nsIContent* content = frame->GetContent();
if (content && (content->IsHTMLElement(nsGkAtoms::body) ||
content == docElement)) {
parent = frame;
}
else {
- const bool isPositioned = frame->IsAbsPosContaininingBlock();
+ const bool isPositioned = frame->IsAbsPosContainingBlock();
const bool isAbsolutelyPositioned = frame->IsAbsolutelyPositioned();
origin += frame->GetPositionIgnoringScrolling();
for ( ; parent ; parent = parent->GetParent()) {
content = parent->GetContent();
// Stop at the first ancestor that is positioned.
- if (parent->IsAbsPosContaininingBlock()) {
+ if (parent->IsAbsPosContainingBlock()) {
offsetParent = content;
break;
}
// Add the parent's origin to our own to get to the
// right coordinate system.
const bool isOffsetParent = !isPositioned && IsOffsetParent(parent);
if (!isAbsolutelyPositioned && !isOffsetParent) {
--- a/layout/base/RestyleManagerBase.cpp
+++ b/layout/base/RestyleManagerBase.cpp
@@ -1111,17 +1111,17 @@ RestyleManagerBase::ProcessRestyledFrame
} else {
for (nsIFrame* cont = frame; cont;
cont = nsLayoutUtils::GetNextContinuationOrIBSplitSibling(cont)) {
// Normally frame construction would set state bits as needed,
// but we're not going to reconstruct the frame so we need to set them.
// It's because we need to set this state on each affected frame
// that we can't coalesce nsChangeHint_UpdateContainingBlock hints up
// to ancestors (i.e. it can't be an inherited change hint).
- if (cont->IsAbsPosContaininingBlock()) {
+ if (cont->IsAbsPosContainingBlock()) {
if (cont->StyleDisplay()->HasTransform(cont)) {
cont->AddStateBits(NS_FRAME_MAY_BE_TRANSFORMED);
}
if (!cont->IsAbsoluteContainer() &&
(cont->GetStateBits() & NS_FRAME_CAN_HAVE_ABSPOS_CHILDREN)) {
cont->MarkAsAbsoluteContainingBlock();
}
} else {
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -3100,17 +3100,17 @@ nsCSSFrameConstructor::ConstructSelectFr
// Notify the listbox that it is being used as a dropdown list.
nsIListControlFrame * listControlFrame = do_QueryFrame(listFrame);
if (listControlFrame) {
listControlFrame->SetComboboxFrame(comboboxFrame);
}
// Notify combobox that it should use the listbox as it's popup
comboBox->SetDropDown(listFrame);
- NS_ASSERTION(!listFrame->IsAbsPosContaininingBlock(),
+ NS_ASSERTION(!listFrame->IsAbsPosContainingBlock(),
"Ended up with positioned dropdown list somehow.");
NS_ASSERTION(!listFrame->IsFloating(),
"Ended up with floating dropdown list somehow.");
// Initialize the scroll frame positioned. Note that it is NOT
// initialized as absolutely positioned.
nsContainerFrame* scrolledFrame =
NS_NewSelectsAreaFrame(mPresShell, styleContext, flags);
@@ -3244,17 +3244,17 @@ nsCSSFrameConstructor::ConstructFieldSet
if (isScrollable) {
fieldsetContentStyle =
BeginBuildingScrollFrame(aState, content, fieldsetContentStyle,
fieldsetFrame, nsCSSAnonBoxes::scrolledContent,
false, scrollFrame);
}
nsContainerFrame* absPosContainer = nullptr;
- if (fieldsetFrame->IsAbsPosContaininingBlock()) {
+ if (fieldsetFrame->IsAbsPosContainingBlock()) {
absPosContainer = fieldsetFrame;
}
// Create the inner ::-moz-fieldset-content frame.
nsContainerFrame* contentFrameTop;
nsContainerFrame* contentFrame;
auto parent = scrollFrame ? scrollFrame : fieldsetFrame;
switch (fieldsetContentDisplay->mDisplay) {
@@ -6146,17 +6146,17 @@ nsCSSFrameConstructor::GetAbsoluteContai
// If the frame is positioned, we will probably return it as the containing
// block (see the exceptions below). Otherwise, we'll start looking at the
// parent frame, unless we're dealing with a scrollframe.
// Scrollframes are special since they're not positioned, but their
// scrolledframe might be. So, we need to check this special case to return
// the correct containing block (the scrolledframe) in that case.
// If we're looking for a fixed-pos containing block and the frame is
// not transformed, skip it.
- if (!frame->IsAbsPosContaininingBlock() ||
+ if (!frame->IsAbsPosContainingBlock() ||
(aType == FIXED_POS &&
!frame->StyleDisplay()->IsFixedPosContainingBlock(frame))) {
continue;
}
nsIFrame* absPosCBCandidate = frame;
nsIAtom* type = absPosCBCandidate->GetType();
if (type == nsGkAtoms::fieldSetFrame) {
absPosCBCandidate = static_cast<nsFieldSetFrame*>(absPosCBCandidate)->GetInner();
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -2281,17 +2281,17 @@ nsDisplayItem::ForceActiveLayers()
sForceCached = true;
}
return sForce;
}
static int32_t ZIndexForFrame(nsIFrame* aFrame)
{
- if (!aFrame->IsAbsPosContaininingBlock() && !aFrame->IsFlexOrGridItem())
+ if (!aFrame->IsAbsPosContainingBlock() && !aFrame->IsFlexOrGridItem())
return 0;
const nsStylePosition* position = aFrame->StylePosition();
if (position->mZIndex.GetUnit() == eStyleUnit_Integer)
return position->mZIndex.GetIntValue();
// sort the auto and 0 elements together
return 0;
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -6305,17 +6305,17 @@ nsLayoutUtils::CalculateContentBEnd(Writ
return contentBEnd;
}
/* static */ nsIFrame*
nsLayoutUtils::GetClosestLayer(nsIFrame* aFrame)
{
nsIFrame* layer;
for (layer = aFrame; layer; layer = layer->GetParent()) {
- if (layer->IsAbsPosContaininingBlock() ||
+ if (layer->IsAbsPosContainingBlock() ||
(layer->GetParent() &&
layer->GetParent()->GetType() == nsGkAtoms::scrollFrame))
break;
}
if (layer)
return layer;
return aFrame->PresContext()->PresShell()->FrameManager()->GetRootFrame();
}
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -3214,17 +3214,17 @@ AccumulateFrameBounds(nsIFrame* aContain
// If this is an inline frame and either the bounds height is 0 (quirks
// layout model) or aUseWholeLineHeightForInlines is set, we need to
// change the top of the bounds to include the whole line.
if (frameBounds.height == 0 || aUseWholeLineHeightForInlines) {
nsIFrame *prevFrame = aFrame;
nsIFrame *f = aFrame;
while (f && f->IsFrameOfType(nsIFrame::eLineParticipant) &&
- !f->IsTransformed() && !f->IsAbsPosContaininingBlock()) {
+ !f->IsTransformed() && !f->IsAbsPosContainingBlock()) {
prevFrame = f;
f = prevFrame->GetParent();
}
if (f != aFrame &&
f &&
f->GetType() == nsGkAtoms::blockFrame) {
// find the line containing aFrame and increase the top of |offset|.
--- a/layout/generic/nsContainerFrame.cpp
+++ b/layout/generic/nsContainerFrame.cpp
@@ -791,17 +791,17 @@ nsContainerFrame::SyncFrameViewPropertie
vm->SetViewVisibility(aView,
aStyleContext->StyleVisibility()->IsVisible()
? nsViewVisibility_kShow : nsViewVisibility_kHide);
}
int32_t zIndex = 0;
bool autoZIndex = false;
- if (aFrame->IsAbsPosContaininingBlock()) {
+ if (aFrame->IsAbsPosContainingBlock()) {
// Make sure z-index is correct
const nsStylePosition* position = aStyleContext->StylePosition();
if (position->mZIndex.GetUnit() == eStyleUnit_Integer) {
zIndex = position->mZIndex.GetIntValue();
} else if (position->mZIndex.GetUnit() == eStyleUnit_Auto) {
autoZIndex = true;
}
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -2872,17 +2872,17 @@ ScrollFrameHelper::AppendScrollPartsTo(n
}
bool overlayScrollbars =
LookAndFeel::GetInt(LookAndFeel::eIntID_UseOverlayScrollbars) != 0;
AutoTArray<nsIFrame*, 3> scrollParts;
for (nsIFrame* kid : mOuter->PrincipalChildList()) {
if (kid == mScrolledFrame ||
- (kid->IsAbsPosContaininingBlock() || overlayScrollbars) != aPositioned)
+ (kid->IsAbsPosContainingBlock() || overlayScrollbars) != aPositioned)
continue;
scrollParts.AppendElement(kid);
}
if (scrollParts.IsEmpty()) {
return;
}
--- a/layout/generic/nsIFrame.h
+++ b/layout/generic/nsIFrame.h
@@ -3170,17 +3170,17 @@ public:
*/
inline bool IsTableCaption() const;
inline bool IsBlockInside() const;
inline bool IsBlockOutside() const;
inline bool IsInlineOutside() const;
inline uint8_t GetDisplay() const;
inline bool IsFloating() const;
- inline bool IsAbsPosContaininingBlock() const;
+ inline bool IsAbsPosContainingBlock() const;
inline bool IsRelativelyPositioned() const;
inline bool IsAbsolutelyPositioned() const;
/**
* Returns the vertical-align value to be used for layout, if it is one
* of the enumerated values. If this is an SVG text frame, it returns a value
* that corresponds to the value of dominant-baseline. If the
* vertical-align property has length or percentage value, this returns
--- a/layout/generic/nsIFrameInlines.h
+++ b/layout/generic/nsIFrameInlines.h
@@ -44,17 +44,17 @@ nsIFrame::IsTableCaption() const
bool
nsIFrame::IsFloating() const
{
return StyleDisplay()->IsFloating(this);
}
bool
-nsIFrame::IsAbsPosContaininingBlock() const
+nsIFrame::IsAbsPosContainingBlock() const
{
return StyleDisplay()->IsAbsPosContainingBlock(this);
}
bool
nsIFrame::IsRelativelyPositioned() const
{
return StyleDisplay()->IsRelativelyPositioned(this);