Source/WebCore/rendering/svg/RenderSVGShape.h - Issue 12616003: Merge 144350

Side by Side Diff: Source/WebCore/rendering/svg/RenderSVGShape.h

Issue 12616003: Merge 144350 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/

Patch Set: Created 7 years, 9 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:

« no previous file with comments | « Source/WebCore/rendering/svg/RenderSVGImage.cpp ('k') | Source/WebCore/rendering/svg/RenderSVGShape.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>	2 * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>

3 * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org>	3 * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org>

4 * Copyright (C) 2005 Eric Seidel <eric@webkit.org>	4 * Copyright (C) 2005 Eric Seidel <eric@webkit.org>

5 * Copyright (C) 2006 Apple Computer, Inc	5 * Copyright (C) 2006 Apple Computer, Inc

6 * Copyright (C) 2009 Google, Inc.	6 * Copyright (C) 2009 Google, Inc.

7 * Copyright (C) 2011 Renata Hodovan <reni@webkit.org>	7 * Copyright (C) 2011 Renata Hodovan <reni@webkit.org>

8 * Copyright (C) 2011 University of Szeged	8 * Copyright (C) 2011 University of Szeged

9 *	9 *

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

(...skipping 96 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
107 virtual FloatRect repaintRectInLocalCoordinates() const { return m_repaintBo undingBox; }	107 virtual FloatRect repaintRectInLocalCoordinates() const { return m_repaintBo undingBox; }

108 virtual FloatRect repaintRectInLocalCoordinatesExcludingSVGShadow() const OV ERRIDE { return m_repaintBoundingBoxExcludingShadow; }	108 virtual FloatRect repaintRectInLocalCoordinatesExcludingSVGShadow() const OV ERRIDE { return m_repaintBoundingBoxExcludingShadow; }

109 virtual const AffineTransform& localToParentTransform() const { return m_loc alTransform; }	109 virtual const AffineTransform& localToParentTransform() const { return m_loc alTransform; }

110 virtual AffineTransform localTransform() const { return m_localTransform; }	110 virtual AffineTransform localTransform() const { return m_localTransform; }

111	111

112 virtual bool isSVGShape() const { return true; }	112 virtual bool isSVGShape() const { return true; }

113 virtual const char* renderName() const { return "RenderSVGShape"; }	113 virtual const char* renderName() const { return "RenderSVGShape"; }

114	114

115 virtual void layout();	115 virtual void layout();

116 virtual void paint(PaintInfo&, const LayoutPoint&);	116 virtual void paint(PaintInfo&, const LayoutPoint&);

117 virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint&);	117 virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& addition alOffset, const RenderLayerModelObject* paintContainer = 0) OVERRIDE;

118	118

119 virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const F loatPoint& pointInParent, HitTestAction);	119 virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const F loatPoint& pointInParent, HitTestAction);

120	120

121 virtual FloatRect objectBoundingBox() const { return m_fillBoundingBox; }	121 virtual FloatRect objectBoundingBox() const { return m_fillBoundingBox; }

122 virtual FloatRect strokeBoundingBox() const { return m_strokeBoundingBox; }	122 virtual FloatRect strokeBoundingBox() const { return m_strokeBoundingBox; }

123 FloatRect calculateObjectBoundingBox() const;	123 FloatRect calculateObjectBoundingBox() const;

124 FloatRect calculateStrokeBoundingBox() const;	124 FloatRect calculateStrokeBoundingBox() const;

125 void updateRepaintBoundingBox();	125 void updateRepaintBoundingBox();

126	126

127 bool setupNonScalingStrokeContext(AffineTransform&, GraphicsContextStateSave r&);	127 bool setupNonScalingStrokeContext(AffineTransform&, GraphicsContextStateSave r&);

(...skipping 31 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
159 return static_cast<const RenderSVGShape*>(object);	159 return static_cast<const RenderSVGShape*>(object);

160 }	160 }

161	161

162 // This will catch anyone doing an unnecessary cast.	162 // This will catch anyone doing an unnecessary cast.

163 void toRenderSVGShape(const RenderSVGShape*);	163 void toRenderSVGShape(const RenderSVGShape*);

164	164

165 }	165 }

166	166

167 #endif // ENABLE(SVG)	167 #endif // ENABLE(SVG)

168 #endif	168 #endif

OLD	NEW