--- a/accessible/base/nsAccessibilityService.cpp
+++ b/accessible/base/nsAccessibilityService.cpp
@@ -1674,22 +1674,22 @@ nsAccessibilityService::CreateAccessible
// accessible HTML table or a direct child of accessible of HTML table.
Accessible* table = aContext->IsTable() ? aContext : nullptr;
if (!table && aContext->Parent() && aContext->Parent()->IsTable())
table = aContext->Parent();
if (table) {
nsIContent* parentContent = aContent->GetParent();
nsIFrame* parentFrame = parentContent->GetPrimaryFrame();
- if (parentFrame->GetType() != nsGkAtoms::tableOuterFrame) {
+ if (parentFrame->GetType() != nsGkAtoms::tableWrapperFrame) {
parentContent = parentContent->GetParent();
parentFrame = parentContent->GetPrimaryFrame();
}
- if (parentFrame->GetType() == nsGkAtoms::tableOuterFrame &&
+ if (parentFrame->GetType() == nsGkAtoms::tableWrapperFrame &&
table->GetContent() == parentContent) {
newAcc = new HTMLTableRowAccessible(aContent, document);
}
}
break;
}
case eHTMLTextFieldType:
newAcc = new HTMLTextFieldAccessible(aContent, document);
--- a/dom/base/nsGkAtomList.h
+++ b/dom/base/nsGkAtomList.h
@@ -2010,17 +2010,17 @@ GK_ATOM(rubyTextFrame, "RubyTextFrame")
GK_ATOM(scrollFrame, "ScrollFrame")
GK_ATOM(scrollbarFrame, "ScrollbarFrame")
GK_ATOM(sequenceFrame, "SequenceFrame")
GK_ATOM(sliderFrame, "sliderFrame")
GK_ATOM(tableCellFrame, "TableCellFrame")
GK_ATOM(tableColFrame, "TableColFrame")
GK_ATOM(tableColGroupFrame, "TableColGroupFrame")
GK_ATOM(tableFrame, "TableFrame")
-GK_ATOM(tableOuterFrame, "TableOuterFrame")
+GK_ATOM(tableWrapperFrame, "TableWrapperFrame")
GK_ATOM(tableRowGroupFrame, "TableRowGroupFrame")
GK_ATOM(tableRowFrame, "TableRowFrame")
GK_ATOM(textInputFrame,"TextInputFrame")
GK_ATOM(textFrame, "TextFrame")
GK_ATOM(viewportFrame, "ViewportFrame")
#ifdef MOZ_XUL
GK_ATOM(XULLabelFrame, "XULLabelFrame")
#endif
--- a/dom/html/nsGenericHTMLElement.cpp
+++ b/dom/html/nsGenericHTMLElement.cpp
@@ -333,17 +333,17 @@ nsGenericHTMLElement::GetOffsetRect(CSSI
nsIFrame* frame = GetStyledFrame();
if (!frame) {
return nullptr;
}
nsIFrame* parent = frame->GetParent();
nsPoint origin(0, 0);
- if (parent && parent->GetType() == nsGkAtoms::tableOuterFrame &&
+ if (parent && parent->GetType() == nsGkAtoms::tableWrapperFrame &&
frame->GetType() == nsGkAtoms::tableFrame) {
origin = parent->GetPositionIgnoringScrolling();
parent = parent->GetParent();
}
nsIContent* offsetParent = nullptr;
Element* docElement = GetComposedDoc()->GetRootElement();
nsIContent* content = frame->GetContent();
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -1935,17 +1935,17 @@ IsTablePseudo(nsIFrame* aFrame)
pseudoType == nsCSSAnonBoxes::inlineTable ||
pseudoType == nsCSSAnonBoxes::tableColGroup ||
pseudoType == nsCSSAnonBoxes::tableRowGroup ||
pseudoType == nsCSSAnonBoxes::tableRow ||
pseudoType == nsCSSAnonBoxes::tableCell ||
(pseudoType == nsCSSAnonBoxes::cellContent &&
aFrame->GetParent()->StyleContext()->GetPseudo() ==
nsCSSAnonBoxes::tableCell) ||
- (pseudoType == nsCSSAnonBoxes::tableOuter &&
+ (pseudoType == nsCSSAnonBoxes::tableWrapper &&
(aFrame->PrincipalChildList().FirstChild()->StyleContext()->GetPseudo() ==
nsCSSAnonBoxes::table ||
aFrame->PrincipalChildList().FirstChild()->StyleContext()->GetPseudo() ==
nsCSSAnonBoxes::inlineTable)));
}
static bool
IsRubyPseudo(nsIFrame* aFrame)
@@ -2067,17 +2067,17 @@ nsCSSFrameConstructor::ConstructTable(ns
nsIContent* const content = aItem.mContent;
nsStyleContext* const styleContext = aItem.mStyleContext;
const uint32_t nameSpaceID = aItem.mNameSpaceID;
// create the pseudo SC for the table wrapper as a child of the inner SC
RefPtr<nsStyleContext> outerStyleContext;
outerStyleContext = mPresShell->StyleSet()->
- ResolveAnonymousBoxStyle(nsCSSAnonBoxes::tableOuter, styleContext);
+ ResolveAnonymousBoxStyle(nsCSSAnonBoxes::tableWrapper, styleContext);
// Create the table wrapper frame which holds the caption and inner table frame
nsContainerFrame* newFrame;
if (kNameSpaceID_MathML == nameSpaceID)
newFrame = NS_NewMathMLmtableOuterFrame(mPresShell, outerStyleContext);
else
newFrame = NS_NewTableWrapperFrame(mPresShell, outerStyleContext);
@@ -6654,17 +6654,17 @@ nsCSSFrameConstructor::FindNextSibling(F
}
// For fieldsets, returns the area frame, if the child is not a legend.
static nsContainerFrame*
GetAdjustedParentFrame(nsContainerFrame* aParentFrame,
nsIAtom* aParentFrameType,
nsIContent* aChildContent)
{
- NS_PRECONDITION(nsGkAtoms::tableOuterFrame != aParentFrameType,
+ NS_PRECONDITION(nsGkAtoms::tableWrapperFrame != aParentFrameType,
"Shouldn't be happening!");
nsContainerFrame* newParent = nullptr;
if (nsGkAtoms::fieldSetFrame == aParentFrameType) {
// If the parent is a fieldSet, use the fieldSet's area frame as the
// parent unless the new content is a legend.
if (!aChildContent->IsHTMLElement(nsGkAtoms::legend)) {
@@ -7950,17 +7950,17 @@ nsCSSFrameConstructor::ContentRangeInser
if (frameItems.NotEmpty()) {
for (nsIContent* child = aStartChild;
child != aEndChild;
child = child->GetNextSibling()){
InvalidateCanvasIfNeeded(mPresShell, child);
}
if (nsGkAtoms::tableFrame == frameType ||
- nsGkAtoms::tableOuterFrame == frameType) {
+ nsGkAtoms::tableWrapperFrame == frameType) {
PullOutCaptionFrames(frameItems, captionItems);
}
}
// If the parent of our current prevSibling is different from the frame we'll
// actually use as the parent, then the calculated insertion point is now
// invalid and as it is unknown where to insert correctly we append instead
// (bug 341858).
@@ -7981,18 +7981,18 @@ nsCSSFrameConstructor::ContentRangeInser
frameItems.FirstChild()->GetParent() != prevSibling->GetParent()) {
#ifdef DEBUG
nsIFrame* frame1 = frameItems.FirstChild()->GetParent();
nsIFrame* frame2 = prevSibling->GetParent();
NS_ASSERTION(!IsFramePartOfIBSplit(frame1) &&
!IsFramePartOfIBSplit(frame2),
"Neither should be ib-split");
NS_ASSERTION((frame1->GetType() == nsGkAtoms::tableFrame &&
- frame2->GetType() == nsGkAtoms::tableOuterFrame) ||
- (frame1->GetType() == nsGkAtoms::tableOuterFrame &&
+ frame2->GetType() == nsGkAtoms::tableWrapperFrame) ||
+ (frame1->GetType() == nsGkAtoms::tableWrapperFrame &&
frame2->GetType() == nsGkAtoms::tableFrame) ||
frame1->GetType() == nsGkAtoms::fieldSetFrame ||
(frame1->GetParent() &&
frame1->GetParent()->GetType() == nsGkAtoms::fieldSetFrame),
"Unexpected frame types");
#endif
isAppend = true;
nsIFrame* appendAfterFrame;
@@ -8020,17 +8020,17 @@ nsCSSFrameConstructor::ContentRangeInser
prevSibling, frameItems);
}
}
// We might have captions; put them into the caption list of the
// table wrapper frame.
if (captionItems.NotEmpty()) {
NS_ASSERTION(nsGkAtoms::tableFrame == frameType ||
- nsGkAtoms::tableOuterFrame == frameType,
+ nsGkAtoms::tableWrapperFrame == frameType,
"parent for caption is not table?");
// We need to determine where to put the caption items; start with the
// the parent frame that has already been determined and get the insertion
// prevsibling of the first caption item.
bool captionIsAppend;
nsIFrame* captionPrevSibling = nullptr;
// aIsRangeInsertSafe is ignored on purpose because it is irrelevant here.
@@ -8053,17 +8053,17 @@ nsCSSFrameConstructor::ContentRangeInser
nsContainerFrame* outerTable = nullptr;
if (GetCaptionAdjustedParent(captionInsertion.mParentFrame,
captionItems.FirstChild(),
&outerTable)) {
// If the parent is not a table wrapper frame we will try to add frames
// to a named child list that the parent does not honor and the frames
// will get lost.
- NS_ASSERTION(nsGkAtoms::tableOuterFrame == outerTable->GetType(),
+ NS_ASSERTION(nsGkAtoms::tableWrapperFrame == outerTable->GetType(),
"Pseudo frame construction failure; "
"a caption can be only a child of a table wrapper frame");
// If the parent of our current prevSibling is different from the frame
// we'll actually use as the parent, then the calculated insertion
// point is now invalid (bug 341382).
if (captionPrevSibling &&
captionPrevSibling->GetParent() != outerTable) {
@@ -8816,17 +8816,17 @@ nsCSSFrameConstructor::CreateContinuingF
} else if (nsGkAtoms::columnSetFrame == frameType) {
MOZ_ASSERT(!aFrame->IsTableCaption(),
"no support for fragmenting table captions yet");
newFrame = NS_NewColumnSetFrame(shell, styleContext, nsFrameState(0));
newFrame->Init(content, aParentFrame, aFrame);
} else if (nsGkAtoms::pageFrame == frameType) {
nsContainerFrame* canvasFrame;
newFrame = ConstructPageFrame(shell, aParentFrame, aFrame, canvasFrame);
- } else if (nsGkAtoms::tableOuterFrame == frameType) {
+ } else if (nsGkAtoms::tableWrapperFrame == frameType) {
newFrame =
CreateContinuingOuterTableFrame(shell, aPresContext, aFrame, aParentFrame,
content, styleContext);
} else if (nsGkAtoms::tableFrame == frameType) {
newFrame =
CreateContinuingTableFrame(shell, aFrame, aParentFrame,
content, styleContext);
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -1592,17 +1592,17 @@ nsLayoutUtils::GetClosestFrameOfType(nsI
}
return nullptr;
}
// static
nsIFrame*
nsLayoutUtils::GetStyleFrame(nsIFrame* aFrame)
{
- if (aFrame->GetType() == nsGkAtoms::tableOuterFrame) {
+ if (aFrame->GetType() == nsGkAtoms::tableWrapperFrame) {
nsIFrame* inner = aFrame->PrincipalChildList().FirstChild();
// inner may be null, if aFrame is mid-destruction
return inner;
}
return aFrame;
}
@@ -3806,17 +3806,17 @@ nsLayoutUtils::BinarySearchForPosition(D
}
static void
AddBoxesForFrame(nsIFrame* aFrame,
nsLayoutUtils::BoxCallback* aCallback)
{
nsIAtom* pseudoType = aFrame->StyleContext()->GetPseudo();
- if (pseudoType == nsCSSAnonBoxes::tableOuter) {
+ if (pseudoType == nsCSSAnonBoxes::tableWrapper) {
AddBoxesForFrame(aFrame->PrincipalChildList().FirstChild(), aCallback);
if (aCallback->mIncludeCaptionBoxForTable) {
nsIFrame* kid = aFrame->GetChildList(nsIFrame::kCaptionList).FirstChild();
if (kid) {
AddBoxesForFrame(kid, aCallback);
}
}
} else if (pseudoType == nsCSSAnonBoxes::mozAnonymousBlock ||
@@ -3841,17 +3841,17 @@ nsLayoutUtils::GetAllInFlowBoxes(nsIFram
}
nsIFrame*
nsLayoutUtils::GetFirstNonAnonymousFrame(nsIFrame* aFrame)
{
while (aFrame) {
nsIAtom* pseudoType = aFrame->StyleContext()->GetPseudo();
- if (pseudoType == nsCSSAnonBoxes::tableOuter) {
+ if (pseudoType == nsCSSAnonBoxes::tableWrapper) {
nsIFrame* f = GetFirstNonAnonymousFrame(aFrame->PrincipalChildList().FirstChild());
if (f) {
return f;
}
nsIFrame* kid = aFrame->GetChildList(nsIFrame::kCaptionList).FirstChild();
if (kid) {
f = GetFirstNonAnonymousFrame(kid);
if (f) {
@@ -6164,17 +6164,17 @@ nsLayoutUtils::GetFirstLinePosition(Writ
const nsIFrame* aFrame,
LinePosition* aResult)
{
const nsBlockFrame* block = nsLayoutUtils::GetAsBlock(const_cast<nsIFrame*>(aFrame));
if (!block) {
// For the first-line baseline we also have to check for a table, and if
// so, use the baseline of its first row.
nsIAtom* fType = aFrame->GetType();
- if (fType == nsGkAtoms::tableOuterFrame) {
+ if (fType == nsGkAtoms::tableWrapperFrame) {
aResult->mBStart = 0;
aResult->mBaseline = aFrame->GetLogicalBaseline(aWM);
// This is what we want for the list bullet caller; not sure if
// other future callers will want the same.
aResult->mBEnd = aFrame->BSize(aWM);
return true;
}
--- a/layout/base/nsLayoutUtils.h
+++ b/layout/base/nsLayoutUtils.h
@@ -343,29 +343,29 @@ public:
{
return GetClosestFrameOfType(aFrame, nsGkAtoms::pageFrame);
}
/**
* Given a frame which is the primary frame for an element,
* return the frame that has the non-pseudoelement style context for
* the content.
- * This is aPrimaryFrame itself except for tableOuter frames.
+ * This is aPrimaryFrame itself except for tableWrapper frames.
*
* Given a non-null input, this will return null if and only if its
* argument is a table wrapper frame that is mid-destruction (and its
* table frame has been destroyed).
*/
static nsIFrame* GetStyleFrame(nsIFrame* aPrimaryFrame);
/**
* Given a content node,
* return the frame that has the non-pseudoelement style context for
* the content. May return null.
- * This is aContent->GetPrimaryFrame() except for tableOuter frames.
+ * This is aContent->GetPrimaryFrame() except for tableWrapper frames.
*/
static nsIFrame* GetStyleFrame(const nsIContent* aContent);
/**
* Gets the real primary frame associated with the content object.
*
* In the case of absolutely positioned elements and floated elements,
* the real primary frame is the frame that is out of the flow and not the
--- a/layout/doc/frame_reflow_debug.html
+++ b/layout/doc/frame_reflow_debug.html
@@ -85,17 +85,17 @@ VP 00B97C30 d=9180,4470
VP 00B97C30 r=1 a=9180,4470 c=9180,4470 cnt=863
scroll 00B97EE0 r=1 a=9180,4470 c=9180,4470 cnt=864
scroll 00B97EE0 r=1 a=9180,4470 c=9180,4470 cnt=865
canvas 00B97C6C r=1 a=9180,UC c=9180,4470 cnt=866
area 02D7AFE4 r=1 a=9180,UC c=9180,UC cnt=867
block 02D7B210 r=1 a=9180,UC c=8940,UC cnt=868
text 02D7B3F8 r=0 a=8940,UC c=UC,UC cnt=869
text 02D7B3F8 d=0,0
- tblO 02D7B5F0 r=0 a=8940,UC c=0,0 cnt=870
+ tblW 02D7B5F0 r=0 a=8940,UC c=0,0 cnt=870
tbl 02D7B7EC r=0 a=8940,UC c=1500,UC cnt=871
rowG 00B984A4 r=0 a=UC,UC c=UC,UC cnt=872
row 02D7BAF8 r=0 a=UC,UC c=UC,UC cnt=873
cell 02D7BC98 r=0 a=UC,UC c=UC,UC cnt=874
block 02D7BCF8 r=0 a=UC,UC c=UC,UC cnt=875
text 02D7BE84 r=0 a=UC,UC c=UC,UC cnt=876
text 02D7BE84 d=300,285 me=300
block 02D7BCF8 d=300,300 me=300
@@ -114,17 +114,17 @@ VP 00B97C30 r=1 a=9180,4470 c=9180,4470
cell 02D7BC98 d=1440,330
row 02D7BAF8 d=1500,330
rowG 00B984A4 d=1500,330
colG 02D7BFB0 r=2 a=1500,UC c=1500,UC cnt=883
col 02D7C0D8 r=0 a=0,0 c=1500,UC cnt=884
col 02D7C0D8 d=0,0
colG 02D7BFB0 d=0,0
tbl 02D7B7EC d=1500,390
- tblO 02D7B5F0 d=1500,390
+ tblW 02D7B5F0 d=1500,390
text 02D7C130 r=0 a=8940,UC c=UC,UC cnt=885
text 02D7C130 d=0,0
block 02D7B210 d=8940,390
area 02D7AFE4 d=9180,630
canvas 00B97C6C d=9180,4470
scroll 00B97EE0 d=9180,4470
scroll 00B97EE0 d=9180,4470
VP 00B97C30 d=9180,4470
@@ -136,17 +136,17 @@ The first line shows the reflow of the v
<tr><td>1</td><td>incremental reflow</td></tr>
<tr><td>2</td><td>resize reflow</td></tr>
<tr><td>3</td><td>style change reflow</td></tr>
<tr><td>4</td><td>dirty reflow.</td></tr>
</table>
<p>The available width is 9180 twips. The available height is 4470 twips (<code class="log">a=9180,4470</code>). The computed width is 9180 twips. The computed height is 4470 twips (<code class="log">c=9180,4470</code>). The line count is 856 (<code class="log">cnt=856</code>).
<p>
-Below this is a line that reads:<p><code class="log">tblO 02D7B5F0 r=0 a=8940,UC c=0,0 cnt=870</code></p><p> Here the <code class="log">UC</code> shows that on initial reflow the available height for the table wrapper frame is unconstrained.
+Below this is a line that reads:<p><code class="log">tblW 02D7B5F0 r=0 a=8940,UC c=0,0 cnt=870</code></p><p> Here the <code class="log">UC</code> shows that on initial reflow the available height for the table wrapper frame is unconstrained.
<p>
The table cell requires its children to compute the MES. It is reported back from the block as:
<p><code class="log">block 02D7BCF8 d=300,300 me=300</code></p>
<p>The block max. element size is 300 twips.
<p> The second table reflow is started at
<p><code class="log">rowG 00B984A4 r=2 a=1500,UC c=1500,UC cnt=879</code></p>
<p>where the previous information is used.
The block has been required to compute the max. element size only once and it reports now:
@@ -181,17 +181,17 @@ The entries in the reflow log can be con
<tr><td>root</td><td>root</td></tr>
<tr><td>scroll</td><td>scroll</td></tr>
<tr><td>caption</td><td>tableCaption</td></tr>
<tr><td>cell</td><td>tableCell</td></tr>
<tr><td>bcCell</td><td>bcTableCell</td></tr>
<tr><td>col</td><td>tableCol</td></tr>
<tr><td>colG</td><td>tableColGroup</td></tr>
<tr><td> tbl</td><td>table</td></tr>
- <tr><td>tblO</td><td>tableOuter</td></tr>
+ <tr><td>tblW</td><td>tableWrapper</td></tr>
<tr><td>rowG</td><td>tableRowGroup</td></tr>
<tr><td>row</td><td>tableRow</td></tr>
<tr><td>textCtl</td><td>textInput</td></tr>
<tr><td>text</td><td>text</td></tr>
<tr><td>VP</td><td>viewport</td></tr>
</table>
<p>Once the problem is reduced to a single frame level, placing a breakpoint at <code>DisplayReflowEnterPrint</code> in <a href="http://lxr.mozilla.org/seamonkey/source/layout/html/base/src/nsFrame.cpp"><code>nsFrame.cpp</code></a> is a very efficient way to step through
the reflow tree.
--- a/layout/doc/table_reflow_slides.html
+++ b/layout/doc/table_reflow_slides.html
@@ -412,17 +412,17 @@
<a href="#s11"><</a>
<a href="#s13">></a>
</div>
<h1>Table Reflow Example</h1>
<table width=100%>
<tr>
<td width=100%>
<pre style="font-size:.6em;">
-tblO 030176CC r=0 a=8940,UC c=0,0 cnt=429
+tblW 030176CC r=0 a=8940,UC c=0,0 cnt=429
tbl 030178C4 r=0 a=8940,UC c=4470,UC cnt=430
rowG 03017A7C r=0 a=UC,UC c=UC,UC cnt=431
row 03017C08 r=0 a=UC,UC c=UC,UC cnt=432
cell 03017DA8 r=0 a=UC,UC c=UC,UC cnt=433
block 03017E08 r=0 a=UC,UC c=UC,UC cnt=434
block 03017E08 d=870,300 me=480
cell 03017DA8 d=930,360 me=540
cell 0301A8CC r=0 a=UC,UC c=UC,UC cnt=436
@@ -439,17 +439,17 @@ tblO 030176CC r=0 a=8940,UC c=0,0 cnt=42
cell 03017DA8 d=1755,360
cell 0301A8CC r=2 a=2625,UC c=2565,UC cnt=446
block 0301A92C r=2 a=2565,UC c=2565,UC cnt=447
block 0301A92C d=2565,300
cell 0301A8CC d=2625,360
row 03017C08 d=4470,360
rowG 03017A7C d=4470,360
tbl 030178C4 d=4500,450
- tblO 030176CC d=4500,450
+ tblW 030176CC d=4500,450
<a href="frame_reflow_debug.html">frame reflow debugging</a> gives instructions
for turning this on.
</pre>
</td>
<td>
<pre style="font-size:.7em;">
<<span class=html>table</span> width=300>
--- a/layout/generic/nsBlockReflowState.cpp
+++ b/layout/generic/nsBlockReflowState.cpp
@@ -828,17 +828,17 @@ nsBlockReflowState::FlowAndPlaceFloat(ns
break;
}
prevFrame = fc->mFloat;
fc = fc->Next();
}
if(prevFrame) {
//get the frame type
- if (nsGkAtoms::tableOuterFrame == prevFrame->GetType()) {
+ if (nsGkAtoms::tableWrapperFrame == prevFrame->GetType()) {
//see if it has "align="
// IE makes a difference between align and he float property
nsIContent* content = prevFrame->GetContent();
if (content) {
// we're interested only if previous frame is align=left
// IE messes things up when "right" (overlapping frames)
if (content->AttrValueIs(kNameSpaceID_None, nsGkAtoms::align,
NS_LITERAL_STRING("left"), eIgnoreCase)) {
--- a/layout/generic/nsFlexContainerFrame.cpp
+++ b/layout/generic/nsFlexContainerFrame.cpp
@@ -1022,17 +1022,17 @@ GetFirstNonAnonBoxDescendant(nsIFrame* a
// SPECIAL CASE: if we're dealing with an anonymous table, then it might
// be wrapping something non-anonymous in its caption or col-group lists
// (instead of its principal child list), so we have to look there.
// (Note: For anonymous tables that have a non-anon cell *and* a non-anon
// column, we'll always return the column. This is fine; we're really just
// looking for a handle to *anything* with a meaningful content node inside
// the table, for use in DOM comparisons to things outside of the table.)
- if (MOZ_UNLIKELY(aFrame->GetType() == nsGkAtoms::tableOuterFrame)) {
+ if (MOZ_UNLIKELY(aFrame->GetType() == nsGkAtoms::tableWrapperFrame)) {
nsIFrame* captionDescendant =
GetFirstNonAnonBoxDescendant(aFrame->GetChildList(kCaptionList).FirstChild());
if (captionDescendant) {
return captionDescendant;
}
} else if (MOZ_UNLIKELY(aFrame->GetType() == nsGkAtoms::tableFrame)) {
nsIFrame* colgroupDescendant =
GetFirstNonAnonBoxDescendant(aFrame->GetChildList(kColGroupList).FirstChild());
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -6774,17 +6774,17 @@ nsFrame::GetNextPrevLineFromeBlockFrame(
//otherwise there is no way to get and click signal to fall before a table (it being a line iterator itself)
nsIPresShell *shell = aPresContext->GetPresShell();
if (!shell)
return NS_ERROR_FAILURE;
int16_t isEditor = shell->GetSelectionFlags();
isEditor = isEditor == nsISelectionDisplay::DISPLAY_ALL;
if ( isEditor )
{
- if (resultFrame->GetType() == nsGkAtoms::tableOuterFrame)
+ if (resultFrame->GetType() == nsGkAtoms::tableWrapperFrame)
{
if (((point.x - offset.x + tempRect.x)<0) || ((point.x - offset.x+ tempRect.x)>tempRect.width))//off left/right side
{
nsIContent* content = resultFrame->GetContent();
if (content)
{
nsIContent* parent = content->GetParent();
if (parent)
@@ -7239,90 +7239,90 @@ nsIFrame::PeekOffset(nsPeekOffsetStruct*
while (NS_FAILED(result)){
int32_t thisLine = nsFrame::GetLineNumber(blockFrame, aPos->mScrollViewStop, &blockFrame);
if (thisLine < 0)
return NS_ERROR_FAILURE;
iter = blockFrame->GetLineIterator();
NS_ASSERTION(iter, "GetLineNumber() succeeded but no block frame?");
result = NS_OK;
- int edgeCase = 0;//no edge case. this should look at thisLine
+ int edgeCase = 0; // no edge case. this should look at thisLine
- bool doneLooping = false;//tells us when no more block frames hit.
- //this part will find a frame or a block frame. if it's a block frame
- //it will "drill down" to find a viable frame or it will return an error.
+ bool doneLooping = false; // tells us when no more block frames hit.
+ // this part will find a frame or a block frame. if it's a block frame
+ // it will "drill down" to find a viable frame or it will return an error.
nsIFrame *lastFrame = this;
do {
result = nsFrame::GetNextPrevLineFromeBlockFrame(PresContext(),
aPos,
blockFrame,
thisLine,
- edgeCase //start from thisLine
- );
- if (NS_SUCCEEDED(result) && (!aPos->mResultFrame || aPos->mResultFrame == lastFrame))//we came back to same spot! keep going
- {
+ edgeCase); // start from thisLine
+
+ // we came back to same spot! keep going
+ if (NS_SUCCEEDED(result) &&
+ (!aPos->mResultFrame || aPos->mResultFrame == lastFrame)) {
aPos->mResultFrame = nullptr;
if (aPos->mDirection == eDirPrevious)
thisLine--;
else
thisLine++;
- }
- else //if failure or success with different frame.
- doneLooping = true; //do not continue with while loop
-
- lastFrame = aPos->mResultFrame; //set last frame
-
- if (NS_SUCCEEDED(result) && aPos->mResultFrame
- && blockFrame != aPos->mResultFrame)// make sure block element is not the same as the one we had before
- {
-/* SPECIAL CHECK FOR TABLE NAVIGATION
- tables need to navigate also and the frame that supports it is nsTableRowGroupFrame which is INSIDE
- nsTableWrapperFrame. if we have stumbled onto an nsTableOuter we need to drill into nsTableRowGroup
- if we hit a header or footer that's ok just go into them,
-*/
+ } else // if failure or success with different frame.
+ doneLooping = true; // do not continue with while loop
+
+ lastFrame = aPos->mResultFrame; // set last frame
+
+ // make sure block element is not the same as the one we had before
+ if (NS_SUCCEEDED(result) &&
+ aPos->mResultFrame &&
+ blockFrame != aPos->mResultFrame) {
+ /* SPECIAL CHECK FOR TABLE NAVIGATION
+ tables need to navigate also and the frame that supports it is
+ nsTableRowGroupFrame which is INSIDE nsTableWrapperFrame.
+ If we have stumbled onto an nsTableWrapperFrame we need to drill
+ into nsTableRowGroup if we hit a header or footer that's ok just
+ go into them.
+ */
bool searchTableBool = false;
- if (aPos->mResultFrame->GetType() == nsGkAtoms::tableOuterFrame ||
- aPos->mResultFrame->GetType() == nsGkAtoms::tableCellFrame)
- {
- nsIFrame *frame = aPos->mResultFrame->PrincipalChildList().FirstChild();
- //got the table frame now
- while(frame) //ok time to drill down to find iterator
- {
+ if (aPos->mResultFrame->GetType() == nsGkAtoms::tableWrapperFrame ||
+ aPos->mResultFrame->GetType() == nsGkAtoms::tableCellFrame) {
+ nsIFrame* frame = aPos->mResultFrame->PrincipalChildList().FirstChild();
+ // got the table frame now
+ // ok time to drill down to find iterator
+ while (frame) {
iter = frame->GetLineIterator();
- if (iter)
- {
+ if (iter) {
aPos->mResultFrame = frame;
searchTableBool = true;
result = NS_OK;
- break; //while(frame)
+ break; // while(frame)
}
result = NS_ERROR_FAILURE;
frame = frame->PrincipalChildList().FirstChild();
}
}
if (!searchTableBool) {
iter = aPos->mResultFrame->GetLineIterator();
result = iter ? NS_OK : NS_ERROR_FAILURE;
}
- if (NS_SUCCEEDED(result) && iter)//we've struck another block element!
- {
+
+ // we've struck another block element!
+ if (NS_SUCCEEDED(result) && iter) {
doneLooping = false;
if (aPos->mDirection == eDirPrevious)
- edgeCase = 1;//far edge, search from end backwards
+ edgeCase = 1; // far edge, search from end backwards
else
- edgeCase = -1;//near edge search from beginning onwards
- thisLine=0;//this line means nothing now.
- //everything else means something so keep looking "inside" the block
+ edgeCase = -1; // near edge search from beginning onwards
+ thisLine = 0; // this line means nothing now.
+ // everything else means something so keep looking "inside" the block
blockFrame = aPos->mResultFrame;
-
- }
- else
- {
- result = NS_OK;//THIS is to mean that everything is ok to the containing while loop
+ } else {
+ // THIS is to mean that everything is ok to the containing while loop
+ result = NS_OK;
break;
}
}
} while (!doneLooping);
}
return result;
}
@@ -8352,17 +8352,17 @@ GetCorrectedParent(const nsIFrame* aFram
return innerTable;
}
}
// Table wrappers are always anon boxes; if we're in here for an outer
// table, that actually means its the _inner_ table that wants to
// know its parent. So get the pseudo of the inner in that case.
nsIAtom* pseudo = aFrame->StyleContext()->GetPseudo();
- if (pseudo == nsCSSAnonBoxes::tableOuter) {
+ if (pseudo == nsCSSAnonBoxes::tableWrapper) {
pseudo = aFrame->PrincipalChildList().FirstChild()->StyleContext()->GetPseudo();
}
return nsFrame::CorrectStyleParentFrame(parent, pseudo);
}
/* static */
nsIFrame*
nsFrame::CorrectStyleParentFrame(nsIFrame* aProspectiveParent,
@@ -8437,17 +8437,17 @@ nsFrame::DoGetParentStyleContext(nsIFram
if (!pseudo || !mContent->IsElement() ||
(!nsCSSAnonBoxes::IsAnonBox(pseudo) &&
// Ensure that we don't return the display:contents style
// of the parent content for pseudos that have the same content
// as their primary frame (like -moz-list-bullets do):
mContent->GetPrimaryFrame() == this) ||
/* if next is true then it's really a request for the table frame's
parent context, see nsTable[Outer]Frame::GetParentStyleContext. */
- pseudo == nsCSSAnonBoxes::tableOuter) {
+ pseudo == nsCSSAnonBoxes::tableWrapper) {
nsStyleContext* sc = fm->GetDisplayContentsStyleFor(parentContent);
if (MOZ_UNLIKELY(sc)) {
return sc;
}
}
} else {
if (!StyleContext()->GetPseudo()) {
// we're a frame for the root. We have no style context parent.
@@ -10113,29 +10113,29 @@ void DR_State::InitFrameTypeTable()
AddFrameTypeInfo(nsGkAtoms::canvasFrame, "canvas", "canvas");
AddFrameTypeInfo(nsGkAtoms::rootFrame, "root", "root");
AddFrameTypeInfo(nsGkAtoms::scrollFrame, "scroll", "scroll");
AddFrameTypeInfo(nsGkAtoms::tableCellFrame, "cell", "tableCell");
AddFrameTypeInfo(nsGkAtoms::bcTableCellFrame, "bcCell", "bcTableCell");
AddFrameTypeInfo(nsGkAtoms::tableColFrame, "col", "tableCol");
AddFrameTypeInfo(nsGkAtoms::tableColGroupFrame, "colG", "tableColGroup");
AddFrameTypeInfo(nsGkAtoms::tableFrame, "tbl", "table");
- AddFrameTypeInfo(nsGkAtoms::tableOuterFrame, "tblO", "tableOuter");
+ AddFrameTypeInfo(nsGkAtoms::tableWrapperFrame, "tblW", "tableWrapper");
AddFrameTypeInfo(nsGkAtoms::tableRowGroupFrame, "rowG", "tableRowGroup");
AddFrameTypeInfo(nsGkAtoms::tableRowFrame, "row", "tableRow");
AddFrameTypeInfo(nsGkAtoms::textInputFrame, "textCtl", "textInput");
AddFrameTypeInfo(nsGkAtoms::textFrame, "text", "text");
AddFrameTypeInfo(nsGkAtoms::viewportFrame, "VP", "viewport");
#ifdef MOZ_XUL
AddFrameTypeInfo(nsGkAtoms::XULLabelFrame, "XULLabel", "XULLabel");
AddFrameTypeInfo(nsGkAtoms::boxFrame, "Box", "Box");
AddFrameTypeInfo(nsGkAtoms::sliderFrame, "Slider", "Slider");
AddFrameTypeInfo(nsGkAtoms::popupSetFrame, "PopupSet", "PopupSet");
#endif
- AddFrameTypeInfo(nullptr, "unknown", "unknown");
+ AddFrameTypeInfo(nullptr, "unknown", "unknown");
}
void DR_State::DisplayFrameTypeInfo(nsIFrame* aFrame,
int32_t aIndent)
{
DR_FrameTypeInfo* frameTypeInfo = GetFrameTypeInfo(aFrame->GetType());
if (frameTypeInfo) {
--- a/layout/generic/nsHTMLReflowState.cpp
+++ b/layout/generic/nsHTMLReflowState.cpp
@@ -2641,17 +2641,17 @@ nsHTMLReflowState::CalculateBlockSideMar
bool isAutoEndMargin = eStyleUnit_Auto == styleSides.GetIEndUnit(cbWM);
if (!isAutoStartMargin && !isAutoEndMargin) {
// Neither margin is 'auto' so we're over constrained. Use the
// 'direction' property of the parent to tell which margin to
// ignore
// First check if there is an HTML alignment that we should honor
const nsHTMLReflowState* prs = mParentReflowState;
if (aFrameType == nsGkAtoms::tableFrame) {
- NS_ASSERTION(prs->frame->GetType() == nsGkAtoms::tableOuterFrame,
+ NS_ASSERTION(prs->frame->GetType() == nsGkAtoms::tableWrapperFrame,
"table not inside table wrapper");
// Center the table within the table wrapper based on the alignment
// of the table wrapper's parent.
prs = prs->mParentReflowState;
}
if (prs &&
(prs->mStyleText->mTextAlign == NS_STYLE_TEXT_ALIGN_MOZ_LEFT ||
prs->mStyleText->mTextAlign == NS_STYLE_TEXT_ALIGN_MOZ_CENTER ||
--- a/layout/generic/nsIFrameInlines.h
+++ b/layout/generic/nsIFrameInlines.h
@@ -34,17 +34,17 @@ nsIFrame::IsFlexOrGridItem() const
GetParent() &&
GetParent()->IsFlexOrGridContainer();
}
bool
nsIFrame::IsTableCaption() const
{
return StyleDisplay()->mDisplay == NS_STYLE_DISPLAY_TABLE_CAPTION &&
- GetParent()->StyleContext()->GetPseudo() == nsCSSAnonBoxes::tableOuter;
+ GetParent()->StyleContext()->GetPseudo() == nsCSSAnonBoxes::tableWrapper;
}
bool
nsIFrame::IsFloating() const
{
return StyleDisplay()->IsFloating(this);
}
--- a/layout/mathml/nsMathMLmrowFrame.cpp
+++ b/layout/mathml/nsMathMLmrowFrame.cpp
@@ -40,17 +40,17 @@ nsMathMLmrowFrame::AttributeChanged(int3
{
// Special for <mtable>: In the frame construction code, we also use
// this frame class as a wrapper for mtable. Hence, we should pass the
// notification to the real mtable
if (mContent->IsMathMLElement(nsGkAtoms::mtable_)) {
nsIFrame* frame = mFrames.FirstChild();
for ( ; frame; frame = frame->PrincipalChildList().FirstChild()) {
// drill down to the real mtable
- if (frame->GetType() == nsGkAtoms::tableOuterFrame)
+ if (frame->GetType() == nsGkAtoms::tableWrapperFrame)
return frame->AttributeChanged(aNameSpaceID, aAttribute, aModType);
}
NS_NOTREACHED("mtable wrapper without the real table frame");
}
return nsMathMLContainerFrame::AttributeChanged(aNameSpaceID, aAttribute, aModType);
}
--- a/layout/style/nsCSSAnonBoxList.h
+++ b/layout/style/nsCSSAnonBoxList.h
@@ -47,17 +47,17 @@ CSS_ANON_BOX(framesetBlank, ":-moz-frame
CSS_ANON_BOX(mozDisplayComboboxControlFrame, ":-moz-display-comboboxcontrol-frame")
CSS_ANON_BOX(htmlCanvasContent, ":-moz-html-canvas-content")
CSS_ANON_BOX(inlineTable, ":-moz-inline-table")
CSS_ANON_BOX(table, ":-moz-table")
CSS_ANON_BOX(tableCell, ":-moz-table-cell")
CSS_ANON_BOX(tableColGroup, ":-moz-table-column-group")
CSS_ANON_BOX(tableCol, ":-moz-table-column")
-CSS_ANON_BOX(tableOuter, ":-moz-table-outer")
+CSS_ANON_BOX(tableWrapper, ":-moz-table-outer")
CSS_ANON_BOX(tableRowGroup, ":-moz-table-row-group")
CSS_ANON_BOX(tableRow, ":-moz-table-row")
CSS_ANON_BOX(canvas, ":-moz-canvas")
CSS_ANON_BOX(pageBreak, ":-moz-pagebreak")
CSS_ANON_BOX(page, ":-moz-page")
CSS_ANON_BOX(pageContent, ":-moz-pagecontent")
CSS_ANON_BOX(pageSequence, ":-moz-page-sequence")
--- a/layout/style/nsComputedDOMStyle.cpp
+++ b/layout/style/nsComputedDOMStyle.cpp
@@ -216,22 +216,24 @@ nsComputedStyleMap::Update()
}
mExposedPropertyCount = index;
}
nsComputedDOMStyle::nsComputedDOMStyle(dom::Element* aElement,
const nsAString& aPseudoElt,
nsIPresShell* aPresShell,
StyleType aStyleType)
- : mDocumentWeak(nullptr), mOuterFrame(nullptr),
- mInnerFrame(nullptr), mPresShell(nullptr),
- mStyleType(aStyleType),
- mStyleContextGeneration(0),
- mExposeVisitedStyle(false),
- mResolvedStyleContext(false)
+ : mDocumentWeak(nullptr)
+ , mOuterFrame(nullptr)
+ , mInnerFrame(nullptr)
+ , mPresShell(nullptr)
+ , mStyleType(aStyleType)
+ , mStyleContextGeneration(0)
+ , mExposeVisitedStyle(false)
+ , mResolvedStyleContext(false)
{
MOZ_ASSERT(aElement && aPresShell);
mDocumentWeak = do_GetWeakReference(aPresShell->GetDocument());
mContent = aElement;
if (!DOMStringIsNull(aPseudoElt) && !aPseudoElt.IsEmpty() &&
@@ -258,17 +260,16 @@ nsComputedDOMStyle::nsComputedDOMStyle(d
// the DOM spec sucks.
mPseudo = nullptr;
}
}
MOZ_ASSERT(aPresShell->GetPresContext());
}
-
nsComputedDOMStyle::~nsComputedDOMStyle()
{
ClearStyleContext();
}
NS_IMPL_CYCLE_COLLECTION_CLASS(nsComputedDOMStyle)
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsComputedDOMStyle)
@@ -320,33 +321,30 @@ nsComputedDOMStyle::GetPropertyValue(con
NS_IMETHODIMP
nsComputedDOMStyle::SetPropertyValue(const nsCSSProperty aPropID,
const nsAString& aValue)
{
return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR;
}
-
NS_IMETHODIMP
nsComputedDOMStyle::GetCssText(nsAString& aCssText)
{
aCssText.Truncate();
return NS_OK;
}
-
NS_IMETHODIMP
nsComputedDOMStyle::SetCssText(const nsAString& aCssText)
{
return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR;
}
-
NS_IMETHODIMP
nsComputedDOMStyle::GetLength(uint32_t* aLength)
{
NS_PRECONDITION(aLength, "Null aLength! Prepare to die!");
uint32_t length = GetComputedStyleMap()->Length();
// Make sure we have up to date style so that we can include custom
@@ -358,26 +356,24 @@ nsComputedDOMStyle::GetLength(uint32_t*
*aLength = length;
ClearCurrentStyleSources();
return NS_OK;
}
-
NS_IMETHODIMP
nsComputedDOMStyle::GetParentRule(nsIDOMCSSRule** aParentRule)
{
*aParentRule = nullptr;
return NS_OK;
}
-
NS_IMETHODIMP
nsComputedDOMStyle::GetPropertyValue(const nsAString& aPropertyName,
nsAString& aReturn)
{
aReturn.Truncate();
ErrorResult error;
RefPtr<CSSValue> val = GetPropertyCSSValue(aPropertyName, error);
@@ -671,17 +667,17 @@ nsComputedDOMStyle::UpdateCurrentStyleSo
// check is needed due to bug 135040 (to avoid using
// mPrimaryFrame). Remove it once that's fixed.
if (!mPseudo && mStyleType == eAll &&
!mContent->IsHTMLElement(nsGkAtoms::area)) {
mOuterFrame = mContent->GetPrimaryFrame();
mInnerFrame = mOuterFrame;
if (mOuterFrame) {
nsIAtom* type = mOuterFrame->GetType();
- if (type == nsGkAtoms::tableOuterFrame) {
+ if (type == nsGkAtoms::tableWrapperFrame) {
// If the frame is a table wrapper frame then we should get the style
// from the inner table frame.
mInnerFrame = mOuterFrame->PrincipalChildList().FirstChild();
NS_ASSERTION(mInnerFrame, "table wrapper must have an inner");
NS_ASSERTION(!mInnerFrame->GetNextSibling(),
"table wrapper frames should have just one child, "
"the inner table");
}
@@ -819,17 +815,16 @@ nsComputedDOMStyle::GetPropertyCSSValue(
val = (this->*getter)();
}
ClearCurrentStyleSources();
return val.forget();
}
-
NS_IMETHODIMP
nsComputedDOMStyle::RemoveProperty(const nsAString& aPropertyName,
nsAString& aReturn)
{
return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR;
}
@@ -837,34 +832,33 @@ NS_IMETHODIMP
nsComputedDOMStyle::GetPropertyPriority(const nsAString& aPropertyName,
nsAString& aReturn)
{
aReturn.Truncate();
return NS_OK;
}
-
NS_IMETHODIMP
nsComputedDOMStyle::SetProperty(const nsAString& aPropertyName,
const nsAString& aValue,
const nsAString& aPriority)
{
return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR;
}
-
NS_IMETHODIMP
nsComputedDOMStyle::Item(uint32_t aIndex, nsAString& aReturn)
{
return nsDOMCSSDeclaration::Item(aIndex, aReturn);
}
void
-nsComputedDOMStyle::IndexedGetter(uint32_t aIndex, bool& aFound,
+nsComputedDOMStyle::IndexedGetter(uint32_t aIndex,
+ bool& aFound,
nsAString& aPropName)
{
nsComputedStyleMap* map = GetComputedStyleMap();
uint32_t length = map->Length();
if (aIndex < length) {
aFound = true;
CopyASCIItoUTF16(nsCSSProps::GetStringValue(map->PropertyAt(aIndex)),
@@ -1851,19 +1845,19 @@ nsComputedDOMStyle::DoGetBackgroundClip(
already_AddRefed<CSSValue>
nsComputedDOMStyle::DoGetBackgroundColor()
{
RefPtr<nsROCSSPrimitiveValue> val = new nsROCSSPrimitiveValue;
SetToRGBAColor(val, StyleBackground()->mBackgroundColor);
return val.forget();
}
-
static void
-SetValueToCalc(const nsStyleCoord::CalcValue *aCalc, nsROCSSPrimitiveValue *aValue)
+SetValueToCalc(const nsStyleCoord::CalcValue* aCalc,
+ nsROCSSPrimitiveValue* aValue)
{
RefPtr<nsROCSSPrimitiveValue> val = new nsROCSSPrimitiveValue;
nsAutoString tmp, result;
result.AppendLiteral("calc(");
val->SetAppUnits(aCalc->mLength);
val->GetCssText(tmp);
@@ -1878,35 +1872,35 @@ SetValueToCalc(const nsStyleCoord::CalcV
}
result.Append(')');
aValue->SetString(result); // not really SetString
}
static void
-AppendCSSGradientLength(const nsStyleCoord& aValue,
+AppendCSSGradientLength(const nsStyleCoord& aValue,
nsROCSSPrimitiveValue* aPrimitive,
- nsAString& aString)
+ nsAString& aString)
{
nsAutoString tokenString;
if (aValue.IsCalcUnit())
SetValueToCalc(aValue.GetCalcValue(), aPrimitive);
else if (aValue.GetUnit() == eStyleUnit_Coord)
aPrimitive->SetAppUnits(aValue.GetCoordValue());
else
aPrimitive->SetPercent(aValue.GetPercentValue());
aPrimitive->GetCssText(tokenString);
aString.Append(tokenString);
}
static void
AppendCSSGradientToBoxPosition(const nsStyleGradient* aGradient,
- nsAString& aString,
- bool& aNeedSep)
+ nsAString& aString,
+ bool& aNeedSep)
{
float xValue = aGradient->mBgPosX.GetPercentValue();
float yValue = aGradient->mBgPosY.GetPercentValue();
if (yValue == 1.0f && xValue == 0.5f) {
// omit "to bottom"
return;
}
--- a/layout/tables/nsTableCellFrame.cpp
+++ b/layout/tables/nsTableCellFrame.cpp
@@ -175,17 +175,17 @@ nsTableCellFrame::NeedsToObserve(const n
// We need the observer to be propagated to all children of the cell
// (i.e., children of the child block) in quirks mode, but only to
// tables in standards mode.
// XXX This may not be true in the case of orthogonal flows within
// the cell (bug 1174711 comment 8); we may need to observe isizes
// instead of bsizes for orthogonal children.
return rs->frame == this &&
(PresContext()->CompatibilityMode() == eCompatibility_NavQuirks ||
- fType == nsGkAtoms::tableOuterFrame);
+ fType == nsGkAtoms::tableWrapperFrame);
}
nsresult
nsTableCellFrame::GetRowIndex(int32_t &aRowIndex) const
{
nsresult result;
nsTableRowFrame* row = static_cast<nsTableRowFrame*>(GetParent());
if (row) {
--- a/layout/tables/nsTableWrapperFrame.cpp
+++ b/layout/tables/nsTableWrapperFrame.cpp
@@ -1008,17 +1008,17 @@ nsTableWrapperFrame::Reflow(nsPresContex
// Return our desired rect
NS_FRAME_SET_TRUNCATION(aStatus, aOuterRS, aDesiredSize);
}
nsIAtom*
nsTableWrapperFrame::GetType() const
{
- return nsGkAtoms::tableOuterFrame;
+ return nsGkAtoms::tableWrapperFrame;
}
/* ----- global methods ----- */
nsIContent*
nsTableWrapperFrame::GetCellAt(uint32_t aRowIdx, uint32_t aColIdx) const
{
nsTableCellMap* cellMap = InnerTableFrame()->GetCellMap();
--- a/layout/tables/nsTableWrapperFrame.h
+++ b/layout/tables/nsTableWrapperFrame.h
@@ -87,17 +87,17 @@ public:
virtual void Reflow(nsPresContext* aPresContext,
nsHTMLReflowMetrics& aDesiredSize,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus) override;
/**
* Get the "type" of the frame
*
- * @see nsGkAtoms::tableOuterFrame
+ * @see nsGkAtoms::tableWrapperFrame
*/
virtual nsIAtom* GetType() const override;
#ifdef DEBUG_FRAME_DUMP
virtual nsresult GetFrameName(nsAString& aResult) const override;
#endif
virtual nsStyleContext* GetParentStyleContext(nsIFrame** aProviderFrame) const override;