Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1399)

Unified Diff: Source/core/layout/svg/LayoutSVGModelObject.h

Issue 945803004: Merge back LayoutLayerModelObject into RenderBoxModelObject (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/layout/svg/LayoutSVGModelObject.h
diff --git a/Source/core/layout/svg/LayoutSVGModelObject.h b/Source/core/layout/svg/LayoutSVGModelObject.h
index adb18a2ec122208a0f5f995c8bfa1580ef814fda..d2d22d78d019f5bfd5ed4abb05006398b2d982f2 100644
--- a/Source/core/layout/svg/LayoutSVGModelObject.h
+++ b/Source/core/layout/svg/LayoutSVGModelObject.h
@@ -47,15 +47,15 @@ public:
virtual bool isChildAllowed(LayoutObject*, const LayoutStyle&) const override;
- virtual LayoutRect clippedOverflowRectForPaintInvalidation(const LayoutLayerModelObject* paintInvalidationContainer, const PaintInvalidationState* = 0) const override;
+ virtual LayoutRect clippedOverflowRectForPaintInvalidation(const RenderBoxModelObject* paintInvalidationContainer, const PaintInvalidationState* = 0) const override;
virtual FloatRect paintInvalidationRectInLocalCoordinates() const override final { return m_paintInvalidationBoundingBox; }
virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const override final;
virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const override;
- virtual void mapLocalToContainer(const LayoutLayerModelObject* paintInvalidationContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0, const PaintInvalidationState* = 0) const override final;
- virtual const LayoutObject* pushMappingToContainer(const LayoutLayerModelObject* ancestorToStopAt, LayoutGeometryMap&) const override final;
+ virtual void mapLocalToContainer(const RenderBoxModelObject* paintInvalidationContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0, const PaintInvalidationState* = 0) const override final;
+ virtual const LayoutObject* pushMappingToContainer(const RenderBoxModelObject* ancestorToStopAt, LayoutGeometryMap&) const override final;
virtual void styleDidChange(StyleDifference, const LayoutStyle* oldStyle) override;
virtual void computeLayerHitTestRects(LayerHitTestRects&) const override final;

Powered by Google App Engine
This is Rietveld 408576698