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

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

Issue 711493004: Remove unnecessary paintContainer parameter from addFocusRingRects (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 6 years, 1 month 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
OLDNEW
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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 bool fillContains(const FloatPoint&, bool requiresFill = true, const WindRul e fillRule = RULE_NONZERO); 98 bool fillContains(const FloatPoint&, bool requiresFill = true, const WindRul e fillRule = RULE_NONZERO);
99 bool strokeContains(const FloatPoint&, bool requiresStroke = true); 99 bool strokeContains(const FloatPoint&, bool requiresStroke = true);
100 100
101 virtual const AffineTransform& localToParentTransform() const override final { return m_localTransform ? *m_localTransform : RenderSVGModelObject::localToPa rentTransform(); } 101 virtual const AffineTransform& localToParentTransform() const override final { return m_localTransform ? *m_localTransform : RenderSVGModelObject::localToPa rentTransform(); }
102 102
103 virtual bool isOfType(RenderObjectType type) const override { return type == RenderObjectSVGShape || RenderSVGModelObject::isOfType(type); } 103 virtual bool isOfType(RenderObjectType type) const override { return type == RenderObjectSVGShape || RenderSVGModelObject::isOfType(type); }
104 virtual const char* renderName() const override { return "RenderSVGShape"; } 104 virtual const char* renderName() const override { return "RenderSVGShape"; }
105 105
106 virtual void layout() override final; 106 virtual void layout() override final;
107 virtual void paint(PaintInfo&, const LayoutPoint&) override final; 107 virtual void paint(PaintInfo&, const LayoutPoint&) override final;
108 virtual void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& addit ionalOffset, const RenderLayerModelObject* paintContainer) const override final; 108 virtual void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& addit ionalOffset) const override final;
109 109
110 virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const F loatPoint& pointInParent, HitTestAction) override final; 110 virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const F loatPoint& pointInParent, HitTestAction) override final;
111 111
112 virtual FloatRect strokeBoundingBox() const override final { return m_stroke BoundingBox; } 112 virtual FloatRect strokeBoundingBox() const override final { return m_stroke BoundingBox; }
113 FloatRect calculateObjectBoundingBox() const; 113 FloatRect calculateObjectBoundingBox() const;
114 FloatRect calculateStrokeBoundingBox() const; 114 FloatRect calculateStrokeBoundingBox() const;
115 void updatePaintInvalidationBoundingBox(); 115 void updatePaintInvalidationBoundingBox();
116 void updateLocalTransform(); 116 void updateLocalTransform();
117 117
118 private: 118 private:
119 FloatRect m_paintInvalidationBoundingBox; 119 FloatRect m_paintInvalidationBoundingBox;
120 OwnPtr<AffineTransform> m_localTransform; 120 OwnPtr<AffineTransform> m_localTransform;
121 OwnPtr<Path> m_path; 121 OwnPtr<Path> m_path;
122 122
123 bool m_needsBoundariesUpdate : 1; 123 bool m_needsBoundariesUpdate : 1;
124 bool m_needsShapeUpdate : 1; 124 bool m_needsShapeUpdate : 1;
125 bool m_needsTransformUpdate : 1; 125 bool m_needsTransformUpdate : 1;
126 }; 126 };
127 127
128 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderSVGShape, isSVGShape()); 128 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderSVGShape, isSVGShape());
129 129
130 } 130 }
131 131
132 #endif 132 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/svg/RenderSVGImage.cpp ('k') | Source/core/rendering/svg/RenderSVGShape.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698