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

Side by Side Diff: Source/core/layout/svg/LayoutSVGModelObject.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/LayoutSVGModelObject.h ('k') | Source/core/layout/svg/LayoutSVGResourceContainer.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (c) 2009, Google Inc. All rights reserved.	2 * Copyright (c) 2009, Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 33 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
44 LayoutSVGModelObject::LayoutSVGModelObject(SVGElement* node)	44 LayoutSVGModelObject::LayoutSVGModelObject(SVGElement* node)

45 : LayoutObject(node)	45 : LayoutObject(node)

46 {	46 {

47 }	47 }

48	48

49 bool LayoutSVGModelObject::isChildAllowed(LayoutObject* child, const LayoutStyle &) const	49 bool LayoutSVGModelObject::isChildAllowed(LayoutObject* child, const LayoutStyle &) const

50 {	50 {

51 return child->isSVG() && !(child->isSVGInline() \|\| child->isSVGInlineText()) ;	51 return child->isSVG() && !(child->isSVGInline() \|\| child->isSVGInlineText()) ;

52 }	52 }

53	53

54 LayoutRect LayoutSVGModelObject::clippedOverflowRectForPaintInvalidation(const L ayoutLayerModelObject* paintInvalidationContainer, const PaintInvalidationState* paintInvalidationState) const	54 LayoutRect LayoutSVGModelObject::clippedOverflowRectForPaintInvalidation(const L ayoutBoxModelObject* paintInvalidationContainer, const PaintInvalidationState* p aintInvalidationState) const

55 {	55 {

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

57 }	57 }

58	58

59 void LayoutSVGModelObject::mapLocalToContainer(const LayoutLayerModelObject* pai ntInvalidationContainer, TransformState& transformState, MapCoordinatesFlags, bo ol* wasFixed, const PaintInvalidationState* paintInvalidationState) const	59 void LayoutSVGModelObject::mapLocalToContainer(const LayoutBoxModelObject* paint InvalidationContainer, TransformState& transformState, MapCoordinatesFlags, bool * wasFixed, const PaintInvalidationState* paintInvalidationState) const

60 {	60 {

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

62 }	62 }

63	63

64 const LayoutObject* LayoutSVGModelObject::pushMappingToContainer(const LayoutLay erModelObject* ancestorToStopAt, LayoutGeometryMap& geometryMap) const	64 const LayoutObject* LayoutSVGModelObject::pushMappingToContainer(const LayoutBox ModelObject* ancestorToStopAt, LayoutGeometryMap& geometryMap) const

65 {	65 {

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

67 }	67 }

68	68

69 void LayoutSVGModelObject::absoluteRects(Vector<IntRect>& rects, const LayoutPoi nt& accumulatedOffset) const	69 void LayoutSVGModelObject::absoluteRects(Vector<IntRect>& rects, const LayoutPoi nt& accumulatedOffset) const

70 {	70 {

71 IntRect rect = enclosingIntRect(strokeBoundingBox());	71 IntRect rect = enclosingIntRect(strokeBoundingBox());

72 rect.moveBy(roundedIntPoint(accumulatedOffset));	72 rect.moveBy(roundedIntPoint(accumulatedOffset));

73 rects.append(rect);	73 rects.append(rect);

74 }	74 }

(...skipping 61 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
136 return;	136 return;

137	137

138 invalidatePaintIfNeeded(paintInvalidationState, paintInvalidationState.paint InvalidationContainer());	138 invalidatePaintIfNeeded(paintInvalidationState, paintInvalidationState.paint InvalidationContainer());

139 clearPaintInvalidationState(paintInvalidationState);	139 clearPaintInvalidationState(paintInvalidationState);

140	140

141 PaintInvalidationState childPaintInvalidationState(paintInvalidationState, * this);	141 PaintInvalidationState childPaintInvalidationState(paintInvalidationState, * this);

142 invalidatePaintOfSubtreesIfNeeded(childPaintInvalidationState);	142 invalidatePaintOfSubtreesIfNeeded(childPaintInvalidationState);

143 }	143 }

144	144

145 } // namespace blink	145 } // namespace blink

OLD	NEW