WebKit merge 41447:41498 [third_party/WebKit]

third_party/WebKit/WebCore/rendering/RenderBoxModelObject.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2006, 2007, 2009 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
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 78 matching lines @@
 
     void paintBorder(GraphicsContext*, int tx, int ty, int w, int h, const RenderStyle*, bool begin = true, bool end = true);
     bool paintNinePieceImage(GraphicsContext*, int tx, int ty, int w, int h, const RenderStyle*, const NinePieceImage&, CompositeOperator = CompositeSourceOver);
     void paintBoxShadow(GraphicsContext*, int tx, int ty, int w, int h, const RenderStyle*, bool begin = true, bool end = true);
     virtual void paintFillLayerExtended(const PaintInfo&, const Color&, const FillLayer*, int clipY, int clipHeight,
                                         int tx, int ty, int width, int height, InlineFlowBox* = 0, CompositeOperator = CompositeSourceOver);
 
     // The difference between this inline's baseline position and the line's baseline position.
     int verticalPosition(bool firstLine) const;
 
+    // Called by RenderObject::destroy() (and RenderWidget::destroy()) and is the only way layers should ever be destroyed
+    void destroyLayer();
+
 protected:
     void calculateBackgroundImageGeometry(const FillLayer*, int tx, int ty, int w, int h, IntRect& destRect, IntPoint& phase, IntSize& tileSize);
     IntSize calculateBackgroundSize(const FillLayer*, int scaledWidth, int scaledHeight) const;
 
 private:
     virtual bool isBoxModelObject() const { return true; }
     friend class RenderView;
 
     RenderLayer* m_layer;
     
     // Used to store state between styleWillChange and styleDidChange
     static bool s_wasFloating;
 };
 
 inline RenderBoxModelObject* toRenderBoxModelObject(RenderObject* o)
 { 
     ASSERT(!o || o->isBoxModelObject());
     return static_cast<RenderBoxModelObject*>(o);
 }
 
 inline const RenderBoxModelObject* toRenderBoxModelObject(const RenderObject* o)
 { 
     ASSERT(!o || o->isBoxModelObject());
     return static_cast<const RenderBoxModelObject*>(o);
 }
 
 // This will catch anyone doing an unnecessary cast.
-void toRenderBoxModelObject(const RenderBox*);
+void toRenderBoxModelObject(const RenderBoxModelObject*);
 
 } // namespace WebCore
 
 #endif // RenderBoxModelObject_h