Revert 117339 - CSS 2.1 failure: inline-table-001 fails

Source/WebCore/rendering/RenderTable.cpp

 /*
  * Copyright (C) 1997 Martin Jones (mjones@kde.org)
  *           (C) 1997 Torben Weis (weis@kde.org)
  *           (C) 1998 Waldo Bastian (bastian@kde.org)
  *           (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 1199 matching lines @@
 
 RenderBlock* RenderTable::firstLineBlock() const
 {
     return 0;
 }
 
 void RenderTable::updateFirstLetter()
 {
 }
 
-enum LineBox { FirstLineBox, LastLineBox };
-
-static LayoutUnit getLineBoxBaseline(const RenderTable* table, LineBox lineBox)
-{
-    if (table->isWritingModeRoot())
-        return -1;
-
-    table->recalcSectionsIfNeeded();
-
-    const RenderTableSection* topNonEmptySection = table->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;
-}
-
-LayoutUnit RenderTable::lastLineBoxBaseline() const
-{
-    return getLineBoxBaseline(this, LastLineBox);
-}
-
 LayoutUnit RenderTable::firstLineBoxBaseline() const
 {
-    return getLineBoxBaseline(this, FirstLineBox);
+    if (isWritingModeRoot())
+        return -1;
+
+    recalcSectionsIfNeeded();
+
+    const RenderTableSection* topNonEmptySection = this->topNonEmptySection();
+    if (!topNonEmptySection)
+        return -1;
+
+    return topNonEmptySection->logicalTop() + topNonEmptySection->firstLineBoxBaseline();
 }
 
 LayoutRect RenderTable::overflowClipRect(const LayoutPoint& location, RenderRegion* region, OverlayScrollbarSizeRelevancy relevancy)
 {
     LayoutRect rect = RenderBlock::overflowClipRect(location, region, relevancy);
     
     // If we have a caption, expand the clip to include the caption.
     // FIXME: Technically this is wrong, but it's virtually impossible to fix this
     // for real until captions have been re-written.
     // FIXME: This code assumes (like all our other caption code) that only top/bottom are
@@ skipping 60 matching lines @@
 const BorderValue& RenderTable::tableEndBorderAdjoiningCell(const RenderTableCell* cell) const
 {
     ASSERT(cell->isFirstOrLastCellInRow());
     if (cell->section()->hasSameDirectionAsTable())
         return style()->borderEnd();
 
     return style()->borderStart();
 }
 
 }