webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 43 insertions, 39 deletions

diff --git a/Source/WebCore/rendering/RenderTableCol.h b/Source/WebCore/rendering/RenderTableCol.h
index da1b3b8f0..e9fbd96a1 100644
--- a/Source/WebCore/rendering/RenderTableCol.h
+++ b/Source/WebCore/rendering/RenderTableCol.h
@@ -23,8 +23,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef RenderTableCol_h
-#define RenderTableCol_h
+#pragma once
 
 #include "RenderBox.h"
 
@@ -35,68 +34,73 @@ class RenderTableCell;
 
 class RenderTableCol final : public RenderBox {
 public:
-    RenderTableCol(Element&, PassRef<RenderStyle>);
-    Element& element() const { return toElement(nodeForNonAnonymous()); }
+    RenderTableCol(Element&, RenderStyle&&);
+    Element& element() const { return downcast<Element>(nodeForNonAnonymous()); }
 
     void clearPreferredLogicalWidthsDirtyBits();
 
     unsigned span() const { return m_span; }
     void setSpan(unsigned span) { m_span = span; }
 
-    bool isTableColumnGroupWithColumnChildren() { return firstChild(); }
+    bool isTableColumnGroupWithColumnChildren() const { return firstChild(); }
     bool isTableColumn() const { return style().display() == TABLE_COLUMN; }
     bool isTableColumnGroup() const { return style().display() == TABLE_COLUMN_GROUP; }
 
     RenderTableCol* enclosingColumnGroup() const;
-    RenderTableCol* enclosingColumnGroupIfAdjacentBefore() const
-    {
-        if (previousSibling())
-            return 0;
-        return enclosingColumnGroup();
-    }
-
-    RenderTableCol* enclosingColumnGroupIfAdjacentAfter() const
-    {
-        if (nextSibling())
-            return 0;
-        return enclosingColumnGroup();
-    }
-
+    RenderTableCol* enclosingColumnGroupIfAdjacentBefore() const;
+    RenderTableCol* enclosingColumnGroupIfAdjacentAfter() const;
 
     // Returns the next column or column-group.
     RenderTableCol* nextColumn() const;
 
-    const BorderValue& borderAdjoiningCellStartBorder(const RenderTableCell*) const;
-    const BorderValue& borderAdjoiningCellEndBorder(const RenderTableCell*) const;
-    const BorderValue& borderAdjoiningCellBefore(const RenderTableCell*) const;
-    const BorderValue& borderAdjoiningCellAfter(const RenderTableCell*) const;
+    const BorderValue& borderAdjoiningCellStartBorder() const;
+    const BorderValue& borderAdjoiningCellEndBorder() const;
+    const BorderValue& borderAdjoiningCellBefore(const RenderTableCell&) const;
+    const BorderValue& borderAdjoiningCellAfter(const RenderTableCell&) const;
+
+    LayoutUnit offsetLeft() const override;
+    LayoutUnit offsetTop() const override;
+    LayoutUnit offsetWidth() const override;
+    LayoutUnit offsetHeight() const override;
+    void updateFromElement() override;
 
 private:
-    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(); }
+    const char* renderName() const override { return "RenderTableCol"; }
+    bool isRenderTableCol() const override { return true; }
+    void computePreferredLogicalWidths() override { ASSERT_NOT_REACHED(); }
 
-    virtual void insertedIntoTree() override;
-    virtual void willBeRemovedFromTree() override;
+    void insertedIntoTree() override;
+    void willBeRemovedFromTree() override;
 
-    virtual bool isChildAllowed(const RenderObject&, const RenderStyle&) const override;
-    virtual bool canHaveChildren() const override;
-    virtual bool requiresLayer() const override { return false; }
+    bool isChildAllowed(const RenderObject&, const RenderStyle&) const override;
+    bool canHaveChildren() const override;
+    bool requiresLayer() const override { return false; }
 
-    virtual LayoutRect clippedOverflowRectForRepaint(const RenderLayerModelObject* repaintContainer) const override;
-    virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) override;
+    LayoutRect clippedOverflowRectForRepaint(const RenderLayerModelObject* repaintContainer) const override;
+    void imageChanged(WrappedImagePtr, const IntRect* = 0) override;
 
-    virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
-    virtual void paint(PaintInfo&, const LayoutPoint&) override { }
+    void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
+    void paint(PaintInfo&, const LayoutPoint&) override { }
 
     RenderTable* table() const;
 
-    unsigned m_span;
+    unsigned m_span { 1 };
 };
 
-RENDER_OBJECT_TYPE_CASTS(RenderTableCol, isRenderTableCol())
+inline RenderTableCol* RenderTableCol::enclosingColumnGroupIfAdjacentBefore() const
+{
+    if (previousSibling())
+        return nullptr;
+    return enclosingColumnGroup();
+}
 
+inline RenderTableCol* RenderTableCol::enclosingColumnGroupIfAdjacentAfter() const
+{
+    if (nextSibling())
+        return nullptr;
+    return enclosingColumnGroup();
 }
 
-#endif
+} // namespace WebCore
+
+SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderTableCol, isRenderTableCol())