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

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

Issue 745383007: Fix an issue where hit detection could fail on rect and ellipse shapes (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Address test failures Created 6 years 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
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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 76
77 virtual ShapeGeometryCodePath geometryCodePath() const { return PathGeometry ; } 77 virtual ShapeGeometryCodePath geometryCodePath() const { return PathGeometry ; }
78 virtual const Vector<FloatPoint>* zeroLengthLineCaps() const { return 0; } 78 virtual const Vector<FloatPoint>* zeroLengthLineCaps() const { return 0; }
79 79
80 virtual FloatRect objectBoundingBox() const override final { return m_fillBo undingBox; } 80 virtual FloatRect objectBoundingBox() const override final { return m_fillBo undingBox; }
81 81
82 protected: 82 protected:
83 virtual void updateShapeFromElement(); 83 virtual void updateShapeFromElement();
84 virtual bool shapeDependentStrokeContains(const FloatPoint&); 84 virtual bool shapeDependentStrokeContains(const FloatPoint&);
85 virtual bool shapeDependentFillContains(const FloatPoint&, const WindRule) c onst; 85 virtual bool shapeDependentFillContains(const FloatPoint&, const WindRule) c onst;
86 bool hasSmoothStroke() const;
87 86
88 // Give RenderSVGPath a hook for updating markers in updateShapeFromElement. 87 // Give RenderSVGPath a hook for updating markers in updateShapeFromElement.
89 virtual void processMarkerPositions() { }; 88 virtual void processMarkerPositions() { };
90 89
91 FloatRect m_fillBoundingBox; 90 FloatRect m_fillBoundingBox;
92 FloatRect m_strokeBoundingBox; 91 FloatRect m_strokeBoundingBox;
93 92
94 private: 93 private:
95 // Hit-detection separated for the fill and the stroke 94 // Hit-detection separated for the fill and the stroke
96 bool fillContains(const FloatPoint&, bool requiresFill = true, const WindRul e fillRule = RULE_NONZERO); 95 bool fillContains(const FloatPoint&, bool requiresFill = true, const WindRul e fillRule = RULE_NONZERO);
(...skipping 23 matching lines...) Expand all
120 bool m_needsBoundariesUpdate : 1; 119 bool m_needsBoundariesUpdate : 1;
121 bool m_needsShapeUpdate : 1; 120 bool m_needsShapeUpdate : 1;
122 bool m_needsTransformUpdate : 1; 121 bool m_needsTransformUpdate : 1;
123 }; 122 };
124 123
125 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderSVGShape, isSVGShape()); 124 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderSVGShape, isSVGShape());
126 125
127 } 126 }
128 127
129 #endif 128 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/svg/RenderSVGRect.cpp ('k') | Source/core/rendering/svg/RenderSVGShape.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698