| Index: Source/WebCore/rendering/RenderTable.cpp
|
| ===================================================================
|
| --- Source/WebCore/rendering/RenderTable.cpp (revision 123241)
|
| +++ Source/WebCore/rendering/RenderTable.cpp (working copy)
|
| @@ -1217,43 +1217,20 @@
|
| {
|
| }
|
|
|
| -enum LineBox { FirstLineBox, LastLineBox };
|
| -
|
| -static LayoutUnit getLineBoxBaseline(const RenderTable* table, LineBox lineBox)
|
| +LayoutUnit RenderTable::firstLineBoxBaseline() const
|
| {
|
| - if (table->isWritingModeRoot())
|
| + if (isWritingModeRoot())
|
| return -1;
|
|
|
| - table->recalcSectionsIfNeeded();
|
| + recalcSectionsIfNeeded();
|
|
|
| - const RenderTableSection* topNonEmptySection = table->topNonEmptySection();
|
| + const RenderTableSection* topNonEmptySection = this->topNonEmptySection();
|
| if (!topNonEmptySection)
|
| return -1;
|
|
|
| - LayoutUnit baseline = topNonEmptySection->firstLineBoxBaseline();
|
| - if (baseline > 0)
|
| - return topNonEmptySection->logicalTop() + baseline;
|
| -
|
| - // The 'first' linebox baseline in a table in the absence of any text in the first section
|
| - // is the top of the table.
|
| - if (lineBox == FirstLineBox)
|
| - return topNonEmptySection->logicalTop();
|
| -
|
| - // The 'last' linebox baseline in a table is the baseline of text in the first
|
| - // cell in the first row/section, so if there is no text do not return a baseline.
|
| - return -1;
|
| + return topNonEmptySection->logicalTop() + topNonEmptySection->firstLineBoxBaseline();
|
| }
|
|
|
| -LayoutUnit RenderTable::lastLineBoxBaseline() const
|
| -{
|
| - return getLineBoxBaseline(this, LastLineBox);
|
| -}
|
| -
|
| -LayoutUnit RenderTable::firstLineBoxBaseline() const
|
| -{
|
| - return getLineBoxBaseline(this, FirstLineBox);
|
| -}
|
| -
|
| LayoutRect RenderTable::overflowClipRect(const LayoutPoint& location, RenderRegion* region, OverlayScrollbarSizeRelevancy relevancy)
|
| {
|
| LayoutRect rect = RenderBlock::overflowClipRect(location, region, relevancy);
|
|
|