X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2FWebKit%2FSource%2Fcore%2Frendering%2FRenderTable.h;h=650c1587797e7e4a40d1c7ee36fc487bd67beffd;hb=4a1a0bdd01eef90b0826a0e761d3379d3715c10f;hp=811c28668dba637f4734b25533569a9594d98268;hpb=b1be5ca53587d23e7aeb77b26861fdc0a181ffd8;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/third_party/WebKit/Source/core/rendering/RenderTable.h b/src/third_party/WebKit/Source/core/rendering/RenderTable.h index 811c286..650c158 100644 --- a/src/third_party/WebKit/Source/core/rendering/RenderTable.h +++ b/src/third_party/WebKit/Source/core/rendering/RenderTable.h @@ -30,7 +30,7 @@ #include "core/rendering/style/CollapsedBorderValue.h" #include "wtf/Vector.h" -namespace WebCore { +namespace blink { class RenderTableCol; class RenderTableCaption; @@ -277,11 +277,9 @@ private: virtual bool isTable() const OVERRIDE { return true; } - virtual bool avoidsFloats() const OVERRIDE { return true; } - virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE; virtual void paintObject(PaintInfo&, const LayoutPoint&) OVERRIDE; - virtual void paintBoxDecorations(PaintInfo&, const LayoutPoint&) OVERRIDE; + virtual void paintBoxDecorationBackground(PaintInfo&, const LayoutPoint&) OVERRIDE; virtual void paintMask(PaintInfo&, const LayoutPoint&) OVERRIDE; virtual void layout() OVERRIDE; virtual void computeIntrinsicLogicalWidths(LayoutUnit& minWidth, LayoutUnit& maxWidth) const OVERRIDE; @@ -297,9 +295,6 @@ private: void updateColumnCache() const; void invalidateCachedColumns(); - virtual RenderBlock* firstLineBlock() const OVERRIDE; - virtual void updateFirstLetter() OVERRIDE; - virtual void updateLogicalWidth() OVERRIDE; LayoutUnit convertStyleLogicalWidthToComputedWidth(const Length& styleLogicalWidth, LayoutUnit availableWidth); @@ -365,6 +360,6 @@ inline RenderTableSection* RenderTable::topSection() const DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderTable, isTable()); -} // namespace WebCore +} // namespace blink #endif // RenderTable_h