Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / rendering / RenderTableCol.h

diff --git a/src/third_party/WebKit/Source/core/rendering/RenderTableCol.h b/src/third_party/WebKit/Source/core/rendering/RenderTableCol.h
index 2cb1bbc..a1377d7 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/RenderTableCol.h
+++ b/src/third_party/WebKit/Source/core/rendering/RenderTableCol.h
@@ -33,13 +33,12 @@ namespace blink {
 class RenderTable;
 class RenderTableCell;
 
-class RenderTableCol FINAL : public RenderBox {
+class RenderTableCol final : public RenderBox {
 public:
     explicit RenderTableCol(Element*);
-    virtual void trace(Visitor*) OVERRIDE;
+    virtual void trace(Visitor*) override;
 
     RenderObject* firstChild() const { ASSERT(children() == virtualChildren()); return children()->firstChild(); }
-    RenderObject* lastChild() const { ASSERT(children() == virtualChildren()); return children()->lastChild(); }
 
     // If you have a RenderTableCol, use firstChild or lastChild instead.
     void slowFirstChild() const WTF_DELETED_FUNCTION;
@@ -51,7 +50,6 @@ public:
     void clearPreferredLogicalWidthsDirtyBits();
 
     unsigned span() const { return m_span; }
-    void setSpan(unsigned span) { m_span = span; }
 
     bool isTableColumnGroupWithColumnChildren() { return firstChild(); }
     bool isTableColumn() const { return style()->display() == TABLE_COLUMN; }
@@ -82,25 +80,25 @@ public:
     const BorderValue& borderAdjoiningCellAfter(const RenderTableCell*) const;
 
 private:
-    virtual RenderObjectChildList* virtualChildren() OVERRIDE { return children(); }
-    virtual const RenderObjectChildList* virtualChildren() const OVERRIDE { return children(); }
+    virtual RenderObjectChildList* virtualChildren() override { return children(); }
+    virtual const RenderObjectChildList* virtualChildren() const override { return children(); }
 
-    virtual const char* renderName() const OVERRIDE { return "RenderTableCol"; }
-    virtual bool isRenderTableCol() const OVERRIDE { return true; }
-    virtual void updateFromElement() OVERRIDE;
-    virtual void computePreferredLogicalWidths() OVERRIDE { ASSERT_NOT_REACHED(); }
+    virtual const char* renderName() const override { return "RenderTableCol"; }
+    virtual bool isOfType(RenderObjectType type) const override { return type == RenderObjectRenderTableCol || RenderBox::isOfType(type); }
+    virtual void updateFromElement() override;
+    virtual void computePreferredLogicalWidths() override { ASSERT_NOT_REACHED(); }
 
-    virtual void insertedIntoTree() OVERRIDE;
-    virtual void willBeRemovedFromTree() OVERRIDE;
+    virtual void insertedIntoTree() override;
+    virtual void willBeRemovedFromTree() override;
 
-    virtual bool isChildAllowed(RenderObject*, RenderStyle*) const OVERRIDE;
-    virtual bool canHaveChildren() const OVERRIDE;
-    virtual LayerType layerTypeRequired() const OVERRIDE { return NoLayer; }
+    virtual bool isChildAllowed(RenderObject*, RenderStyle*) const override;
+    virtual bool canHaveChildren() const override;
+    virtual LayerType layerTypeRequired() const override { return NoLayer; }
 
-    virtual LayoutRect clippedOverflowRectForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer, const PaintInvalidationState* = 0) const OVERRIDE;
-    virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) OVERRIDE;
+    virtual LayoutRect clippedOverflowRectForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer, const PaintInvalidationState* = 0) const override;
+    virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) override;
 
-    virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE;
+    virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
 
     RenderTable* table() const;