Merge back LayoutLayerModelObject into RenderBoxModelObject

Source/core/layout/LayoutTableCol.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 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 76 matching lines @@
     virtual void updateFromElement() override;
     virtual void computePreferredLogicalWidths() override { ASSERT_NOT_REACHED(); }
 
     virtual void insertedIntoTree() override;
     virtual void willBeRemovedFromTree() override;
 
     virtual bool isChildAllowed(LayoutObject*, const LayoutStyle&) const override;
     virtual bool canHaveChildren() const override;
     virtual LayerType layerTypeRequired() const override { return NoLayer; }
 
-    virtual LayoutRect clippedOverflowRectForPaintInvalidation(const LayoutLayerModelObject* paintInvalidationContainer, const PaintInvalidationState* = 0) const override;
+    virtual LayoutRect clippedOverflowRectForPaintInvalidation(const LayoutBoxModelObject* paintInvalidationContainer, const PaintInvalidationState* = 0) const override;
     virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) override;
 
     virtual void styleDidChange(StyleDifference, const LayoutStyle* oldStyle) override;
 
     LayoutTable* table() const;
 
     LayoutObjectChildList m_children;
     unsigned m_span;
 };
 
 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutTableCol, isLayoutTableCol());
 
 }
 
 #endif