Source/core/layout/svg/LayoutSVGInline.cpp - Issue 945803004: Merge back LayoutLayerModelObject into RenderBoxModelObject

Side by Side Diff: Source/core/layout/svg/LayoutSVGInline.cpp

Issue 945803004: Merge back LayoutLayerModelObject into RenderBoxModelObject (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Better rebasing. 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « Source/core/layout/svg/LayoutSVGInline.h ('k') | Source/core/layout/svg/LayoutSVGInlineText.h » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz>	2 * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz>

3 * Copyright (C) 2006 Apple Inc. All rights reserved.	3 * Copyright (C) 2006 Apple Inc. All rights reserved.

4 * Copyright (C) Research In Motion Limited 2010. All rights reserved.	4 * Copyright (C) Research In Motion Limited 2010. All rights reserved.

5 *	5 *

6 * This library is free software; you can redistribute it and/or	6 * This library is free software; you can redistribute it and/or

7 * modify it under the terms of the GNU Library General Public	7 * modify it under the terms of the GNU Library General Public

8 * License as published by the Free Software Foundation; either	8 * License as published by the Free Software Foundation; either

9 * version 2 of the License, or (at your option) any later version.	9 * version 2 of the License, or (at your option) any later version.

10 *	10 *

(...skipping 67 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
78 }	78 }

79	79

80 FloatRect LayoutSVGInline::paintInvalidationRectInLocalCoordinates() const	80 FloatRect LayoutSVGInline::paintInvalidationRectInLocalCoordinates() const

81 {	81 {

82 if (const LayoutObject* object = LayoutSVGText::locateLayoutSVGTextAncestor( this))	82 if (const LayoutObject* object = LayoutSVGText::locateLayoutSVGTextAncestor( this))

83 return object->paintInvalidationRectInLocalCoordinates();	83 return object->paintInvalidationRectInLocalCoordinates();

84	84

85 return FloatRect();	85 return FloatRect();

86 }	86 }

87	87

88 LayoutRect LayoutSVGInline::clippedOverflowRectForPaintInvalidation(const Layout LayerModelObject* paintInvalidationContainer, const PaintInvalidationState* pain tInvalidationState) const	88 LayoutRect LayoutSVGInline::clippedOverflowRectForPaintInvalidation(const Layout BoxModelObject* paintInvalidationContainer, const PaintInvalidationState* paintI nvalidationState) const

89 {	89 {

90 return SVGLayoutSupport::clippedOverflowRectForPaintInvalidation(this, paint InvalidationContainer, paintInvalidationState);	90 return SVGLayoutSupport::clippedOverflowRectForPaintInvalidation(this, paint InvalidationContainer, paintInvalidationState);

91 }	91 }

92	92

93 void LayoutSVGInline::mapLocalToContainer(const LayoutLayerModelObject* paintInv alidationContainer, TransformState& transformState, MapCoordinatesFlags, bool* w asFixed, const PaintInvalidationState* paintInvalidationState) const	93 void LayoutSVGInline::mapLocalToContainer(const LayoutBoxModelObject* paintInval idationContainer, TransformState& transformState, MapCoordinatesFlags, bool* was Fixed, const PaintInvalidationState* paintInvalidationState) const

94 {	94 {

95 SVGLayoutSupport::mapLocalToContainer(this, paintInvalidationContainer, tran sformState, wasFixed, paintInvalidationState);	95 SVGLayoutSupport::mapLocalToContainer(this, paintInvalidationContainer, tran sformState, wasFixed, paintInvalidationState);

96 }	96 }

97	97

98 const LayoutObject* LayoutSVGInline::pushMappingToContainer(const LayoutLayerMod elObject* ancestorToStopAt, LayoutGeometryMap& geometryMap) const	98 const LayoutObject* LayoutSVGInline::pushMappingToContainer(const LayoutBoxModel Object* ancestorToStopAt, LayoutGeometryMap& geometryMap) const

99 {	99 {

100 return SVGLayoutSupport::pushMappingToContainer(this, ancestorToStopAt, geom etryMap);	100 return SVGLayoutSupport::pushMappingToContainer(this, ancestorToStopAt, geom etryMap);

101 }	101 }

102	102

103 void LayoutSVGInline::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixed) co nst	103 void LayoutSVGInline::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixed) co nst

104 {	104 {

105 const LayoutObject* object = LayoutSVGText::locateLayoutSVGTextAncestor(this );	105 const LayoutObject* object = LayoutSVGText::locateLayoutSVGTextAncestor(this );

106 if (!object)	106 if (!object)

107 return;	107 return;

108	108

(...skipping 35 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
144 RenderInline::removeChild(child);	144 RenderInline::removeChild(child);

145 return;	145 return;

146 }	146 }

147 Vector<SVGTextLayoutAttributes*, 2> affectedAttributes;	147 Vector<SVGTextLayoutAttributes*, 2> affectedAttributes;

148 textRenderer->subtreeChildWillBeRemoved(child, affectedAttributes);	148 textRenderer->subtreeChildWillBeRemoved(child, affectedAttributes);

149 RenderInline::removeChild(child);	149 RenderInline::removeChild(child);

150 textRenderer->subtreeChildWasRemoved(affectedAttributes);	150 textRenderer->subtreeChildWasRemoved(affectedAttributes);

151 }	151 }

152	152

153 }	153 }

OLD	NEW