| Index: sky/engine/core/rendering/RenderObject.h
|
| diff --git a/sky/engine/core/rendering/RenderObject.h b/sky/engine/core/rendering/RenderObject.h
|
| index 7ee9de9d7a1810e6bafc733f5140d30033779522..f01c9f55f5d8ad650edf00b51ade51d048ffc2a8 100644
|
| --- a/sky/engine/core/rendering/RenderObject.h
|
| +++ b/sky/engine/core/rendering/RenderObject.h
|
| @@ -275,7 +275,6 @@ public:
|
| virtual bool canHaveGeneratedChildren() const;
|
| virtual bool isChildAllowed(RenderObject*, RenderStyle*) const { return true; }
|
| virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0);
|
| - virtual void addChildIgnoringContinuation(RenderObject* newChild, RenderObject* beforeChild = 0) { return addChild(newChild, beforeChild); }
|
| virtual void removeChild(RenderObject*);
|
| //////////////////////////////////////////
|
|
|
| @@ -405,10 +404,6 @@ public:
|
| return isAnonymous() && style()->display() == PARAGRAPH;
|
| }
|
|
|
| - bool isElementContinuation() const { return node() && node()->renderer() != this; }
|
| - bool isInlineElementContinuation() const { return isElementContinuation() && isInline(); }
|
| - virtual RenderBoxModelObject* virtualContinuation() const { return 0; }
|
| -
|
| bool isOutOfFlowPositioned() const { return m_bitfields.isOutOfFlowPositioned(); } // absolute or fixed positioning
|
| bool isRelPositioned() const { return m_bitfields.isRelPositioned(); } // relative positioning
|
| bool isPositioned() const { return m_bitfields.isPositioned(); }
|
| @@ -507,7 +502,8 @@ public:
|
| // is true if the renderer returned is an ancestor of paintInvalidationContainer.
|
| RenderObject* container(const RenderLayerModelObject* paintInvalidationContainer = 0, bool* paintInvalidationContainerSkipped = 0) const;
|
|
|
| - virtual RenderObject* hoverAncestor() const { return parent(); }
|
| + // FIXME(sky): Inline this
|
| + RenderObject* hoverAncestor() const { return parent(); }
|
|
|
| Element* offsetParent() const;
|
|
|
|
|