diff options
Diffstat (limited to 'Source/WebCore/rendering/RenderInline.h')
| -rw-r--r-- | Source/WebCore/rendering/RenderInline.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/WebCore/rendering/RenderInline.h b/Source/WebCore/rendering/RenderInline.h index 4a5bb09dc..59b8fcb80 100644 --- a/Source/WebCore/rendering/RenderInline.h +++ b/Source/WebCore/rendering/RenderInline.h @@ -131,12 +131,12 @@ private: virtual LayoutUnit offsetWidth() const { return linesBoundingBox().width(); } virtual LayoutUnit offsetHeight() const { return linesBoundingBox().height(); } - virtual LayoutRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const; - virtual LayoutRect rectWithOutlineForRepaint(RenderBoxModelObject* repaintContainer, LayoutUnit outlineWidth) const; - virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, LayoutRect&, bool fixed) const; + virtual LayoutRect clippedOverflowRectForRepaint(RenderLayerModelObject* repaintContainer) const OVERRIDE; + virtual LayoutRect rectWithOutlineForRepaint(RenderLayerModelObject* repaintContainer, LayoutUnit outlineWidth) const OVERRIDE; + virtual void computeRectForRepaint(RenderLayerModelObject* repaintContainer, LayoutRect&, bool fixed) const OVERRIDE; - virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, TransformState&, MapLocalToContainerFlags mode = ApplyContainerFlip | SnapOffsetForTransforms, bool* wasFixed = 0) const OVERRIDE; - virtual const RenderObject* pushMappingToContainer(const RenderBoxModelObject* ancestorToStopAt, RenderGeometryMap&) const; + virtual void mapLocalToContainer(RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip | SnapOffsetForTransforms, bool* wasFixed = 0) const OVERRIDE; + virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const OVERRIDE; virtual VisiblePosition positionForPoint(const LayoutPoint&); @@ -161,11 +161,11 @@ private: virtual void imageChanged(WrappedImagePtr, const IntRect* = 0); -#if ENABLE(DASHBOARD_SUPPORT) || ENABLE(WIDGET_REGION) - virtual void addDashboardRegions(Vector<DashboardRegionValue>&); +#if ENABLE(DASHBOARD_SUPPORT) || ENABLE(DRAGGABLE_REGION) + virtual void addAnnotatedRegions(Vector<AnnotatedRegionValue>&); #endif - virtual void updateBoxModelInfoFromStyle(); + virtual void updateFromStyle() OVERRIDE; RenderInline* clone() const; |