| Index: Source/core/rendering/RenderObject.h
|
| diff --git a/Source/core/rendering/RenderObject.h b/Source/core/rendering/RenderObject.h
|
| index c0de169ae7ec0f9b7a3895708c42166f0a5e6e09..b3853991fcf52b7376526df3f3fc9312b2f03531 100644
|
| --- a/Source/core/rendering/RenderObject.h
|
| +++ b/Source/core/rendering/RenderObject.h
|
| @@ -61,7 +61,6 @@ class RenderFlowThread;
|
| class RenderGeometryMap;
|
| class RenderLayer;
|
| class RenderLayerModelObject;
|
| -class RenderNamedFlowThread;
|
| class RenderSVGResourceContainer;
|
| class RenderTable;
|
| class RenderTheme;
|
| @@ -212,8 +211,6 @@ public:
|
| return locateFlowThreadContainingBlock();
|
| }
|
|
|
| - RenderNamedFlowThread* renderNamedFlowThreadWrapper() const;
|
| -
|
| virtual bool isEmpty() const { return firstChild() == 0; }
|
|
|
| #ifndef NDEBUG
|
| @@ -346,7 +343,6 @@ public:
|
| virtual bool isRenderInline() const { return false; }
|
| virtual bool isRenderPart() const { return false; }
|
| virtual bool isRenderRegion() const { return false; }
|
| - virtual bool isRenderNamedFlowFragment() const { return false; }
|
| virtual bool isRenderView() const { return false; }
|
| virtual bool isReplica() const { return false; }
|
|
|
| @@ -375,10 +371,8 @@ public:
|
| virtual bool isRenderGrid() const { return false; }
|
|
|
| virtual bool isRenderFlowThread() const { return false; }
|
| - virtual bool isRenderNamedFlowThread() const { return false; }
|
| bool isInFlowRenderFlowThread() const { return isRenderFlowThread() && !isOutOfFlowPositioned(); }
|
| bool isOutOfFlowRenderFlowThread() const { return isRenderFlowThread() && isOutOfFlowPositioned(); }
|
| - bool isRenderNamedFlowFragmentContainer() const;
|
|
|
| virtual bool isRenderMultiColumnBlock() const { return false; }
|
| virtual bool isRenderMultiColumnSet() const { return false; }
|
| @@ -611,7 +605,7 @@ public:
|
| // is true if the renderer returned is an ancestor of repaintContainer.
|
| RenderObject* container(const RenderLayerModelObject* repaintContainer = 0, bool* repaintContainerSkipped = 0) const;
|
|
|
| - virtual RenderObject* hoverAncestor() const;
|
| + virtual RenderObject* hoverAncestor() const { return parent(); }
|
|
|
| Element* offsetParent() const;
|
|
|
|
|