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

Side by Side Diff: Source/core/rendering/shapes/PolygonShape.h

Issue 226363003: [CSS Shapes] Simplify Polygon implementation (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 8 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. 2 * Copyright (C) 2012 Adobe Systems Incorporated. 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above 8 * 1. Redistributions of source code must retain the above
9 * copyright notice, this list of conditions and the following 9 * copyright notice, this list of conditions and the following
10 * disclaimer. 10 * disclaimer.
(...skipping 13 matching lines...) Expand all
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
25 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 25 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
26 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 26 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
27 * OF THE POSSIBILITY OF SUCH DAMAGE. 27 * OF THE POSSIBILITY OF SUCH DAMAGE.
28 */ 28 */
29 29
30 #ifndef PolygonShape_h 30 #ifndef PolygonShape_h
31 #define PolygonShape_h 31 #define PolygonShape_h
32 32
33 #include "core/rendering/shapes/Shape.h" 33 #include "core/rendering/shapes/Shape.h"
34 #include "core/rendering/shapes/ShapeInterval.h"
34 #include "platform/geometry/FloatPolygon.h" 35 #include "platform/geometry/FloatPolygon.h"
35 36
36 namespace WebCore { 37 namespace WebCore {
37 38
38 class OffsetPolygonEdge FINAL : public VertexPair { 39 class OffsetPolygonEdge FINAL : public VertexPair {
39 public: 40 public:
40 enum Basis {
41 Edge,
42 Vertex,
43 LineTop
44 };
45
46 OffsetPolygonEdge(const FloatPolygonEdge& edge, const FloatSize& offset) 41 OffsetPolygonEdge(const FloatPolygonEdge& edge, const FloatSize& offset)
47 : m_vertex1(edge.vertex1() + offset) 42 : m_vertex1(edge.vertex1() + offset)
48 , m_vertex2(edge.vertex2() + offset) 43 , m_vertex2(edge.vertex2() + offset)
49 , m_edgeIndex(edge.edgeIndex())
50 , m_basis(Edge)
51 {
52 }
53
54 OffsetPolygonEdge(const FloatPoint& reflexVertex, const FloatSize& offset1, const FloatSize& offset2)
55 : m_vertex1(reflexVertex + offset1)
56 , m_vertex2(reflexVertex + offset2)
57 , m_edgeIndex(-1)
58 , m_basis(Vertex)
59 {
60 }
61
62 OffsetPolygonEdge(const FloatPolygon& polygon, float minLogicalIntervalTop, const FloatSize& offset)
63 : m_vertex1(FloatPoint(polygon.boundingBox().x(), minLogicalIntervalTop) + offset)
64 , m_vertex2(FloatPoint(polygon.boundingBox().maxX(), minLogicalIntervalT op) + offset)
65 , m_edgeIndex(-1)
66 , m_basis(LineTop)
67 { 44 {
68 } 45 }
69 46
70 virtual const FloatPoint& vertex1() const OVERRIDE { return m_vertex1; } 47 virtual const FloatPoint& vertex1() const OVERRIDE { return m_vertex1; }
71 virtual const FloatPoint& vertex2() const OVERRIDE { return m_vertex2; } 48 virtual const FloatPoint& vertex2() const OVERRIDE { return m_vertex2; }
72 int edgeIndex() const { return m_edgeIndex; } 49
73 Basis basis() const { return m_basis; } 50 bool isWithinYRange(float y1, float y2) const { return y1 <= minY() && y2 >= maxY(); }
51 bool overlapsYRange(float y1, float y2) const { return y2 >= minY() && y1 <= maxY(); }
52 float xIntercept(float y) const;
53 FloatShapeInterval clippedEdgeXRange(float y1, float y2) const;
74 54
75 private: 55 private:
76 FloatPoint m_vertex1; 56 FloatPoint m_vertex1;
77 FloatPoint m_vertex2; 57 FloatPoint m_vertex2;
78 int m_edgeIndex;
79 Basis m_basis;
80 }; 58 };
81 59
82 class PolygonShape FINAL : public Shape { 60 class PolygonShape FINAL : public Shape {
83 WTF_MAKE_NONCOPYABLE(PolygonShape); 61 WTF_MAKE_NONCOPYABLE(PolygonShape);
84 public: 62 public:
85 PolygonShape(PassOwnPtr<Vector<FloatPoint> > vertices, WindRule fillRule) 63 PolygonShape(PassOwnPtr<Vector<FloatPoint> > vertices, WindRule fillRule)
86 : Shape() 64 : Shape()
87 , m_polygon(vertices, fillRule) 65 , m_polygon(vertices, fillRule)
88 , m_marginBounds(nullptr)
89 { 66 {
90 } 67 }
91 68
92 virtual LayoutRect shapeMarginLogicalBoundingBox() const OVERRIDE { return s tatic_cast<LayoutRect>(shapeMarginBounds().boundingBox()); } 69 virtual LayoutRect shapeMarginLogicalBoundingBox() const OVERRIDE;
93 virtual bool isEmpty() const OVERRIDE { return m_polygon.isEmpty(); } 70 virtual bool isEmpty() const OVERRIDE { return m_polygon.isEmpty(); }
94 virtual void getExcludedIntervals(LayoutUnit logicalTop, LayoutUnit logicalH eight, SegmentList&) const OVERRIDE; 71 virtual void getExcludedIntervals(LayoutUnit logicalTop, LayoutUnit logicalH eight, SegmentList&) const OVERRIDE;
95 72
96 private: 73 private:
97 const FloatPolygon& shapeMarginBounds() const;
98
99 FloatPolygon m_polygon; 74 FloatPolygon m_polygon;
100 mutable OwnPtr<FloatPolygon> m_marginBounds;
101 }; 75 };
102 76
103 } // namespace WebCore 77 } // namespace WebCore
104 78
105 #endif // PolygonShape_h 79 #endif // PolygonShape_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/rendering/shapes/PolygonShape.cpp » ('j') | Source/platform/geometry/FloatRect.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698