Merge 105768 - Incorrect positioning of floating pseudo-elements in table captions

Source/WebCore/rendering/RenderTable.h

 /*
  * 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, 2009, 2010 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 230 matching lines @@
     virtual void computeLogicalWidth();
 
     virtual LayoutRect overflowClipRect(const LayoutPoint& location, RenderRegion*, OverlayScrollbarSizeRelevancy = IgnoreOverlayScrollbarSize);
 
     virtual void addOverflowFromChildren();
 
     void subtractCaptionRect(LayoutRect&) const;
 
     void recalcCollapsedBorders();
     void recalcSections() const;
-    void adjustLogicalHeightForCaption(RenderBlock*);
+    void layoutCaption(RenderTableCaption*);
 
     mutable Vector<LayoutUnit> m_columnPos;
     mutable Vector<ColumnStruct> m_columns;
 
     mutable Vector<RenderTableCaption*> m_captions;
     mutable RenderTableSection* m_head;
     mutable RenderTableSection* m_foot;
     mutable RenderTableSection* m_firstBody;
 
     OwnPtr<TableLayout> m_tableLayout;
@@ skipping 32 matching lines @@
     ASSERT(!object || object->isTable());
     return static_cast<const RenderTable*>(object);
 }
 
 // This will catch anyone doing an unnecessary cast.
 void toRenderTable(const RenderTable*);
 
 } // namespace WebCore
 
 #endif // RenderTable_h