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

Side by Side Diff: Source/platform/geometry/FloatPolygon.h

Issue 858663002: Fix template angle bracket syntax in platform (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 11 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 42
43 class FloatPolygonEdge; 43 class FloatPolygonEdge;
44 44
45 // This class is used by PODIntervalTree for debugging. 45 // This class is used by PODIntervalTree for debugging.
46 #ifndef NDEBUG 46 #ifndef NDEBUG
47 template <class> struct ValueToString; 47 template <class> struct ValueToString;
48 #endif 48 #endif
49 49
50 class PLATFORM_EXPORT FloatPolygon { 50 class PLATFORM_EXPORT FloatPolygon {
51 public: 51 public:
52 FloatPolygon(PassOwnPtr<Vector<FloatPoint> > vertices, WindRule fillRule); 52 FloatPolygon(PassOwnPtr<Vector<FloatPoint>> vertices, WindRule fillRule);
53 53
54 const FloatPoint& vertexAt(unsigned index) const { return (*m_vertices)[inde x]; } 54 const FloatPoint& vertexAt(unsigned index) const { return (*m_vertices)[inde x]; }
55 unsigned numberOfVertices() const { return m_vertices->size(); } 55 unsigned numberOfVertices() const { return m_vertices->size(); }
56 56
57 WindRule fillRule() const { return m_fillRule; } 57 WindRule fillRule() const { return m_fillRule; }
58 58
59 const FloatPolygonEdge& edgeAt(unsigned index) const { return m_edges[index] ; } 59 const FloatPolygonEdge& edgeAt(unsigned index) const { return m_edges[index] ; }
60 unsigned numberOfEdges() const { return m_edges.size(); } 60 unsigned numberOfEdges() const { return m_edges.size(); }
61 61
62 FloatRect boundingBox() const { return m_boundingBox; } 62 FloatRect boundingBox() const { return m_boundingBox; }
63 bool overlappingEdges(float minY, float maxY, Vector<const FloatPolygonEdge* >& result) const; 63 bool overlappingEdges(float minY, float maxY, Vector<const FloatPolygonEdge* >& result) const;
64 bool contains(const FloatPoint&) const; 64 bool contains(const FloatPoint&) const;
65 bool isEmpty() const { return m_empty; } 65 bool isEmpty() const { return m_empty; }
66 66
67 private: 67 private:
68 typedef PODInterval<float, FloatPolygonEdge*> EdgeInterval; 68 typedef PODInterval<float, FloatPolygonEdge*> EdgeInterval;
69 typedef PODIntervalTree<float, FloatPolygonEdge*> EdgeIntervalTree; 69 typedef PODIntervalTree<float, FloatPolygonEdge*> EdgeIntervalTree;
70 70
71 bool containsNonZero(const FloatPoint&) const; 71 bool containsNonZero(const FloatPoint&) const;
72 bool containsEvenOdd(const FloatPoint&) const; 72 bool containsEvenOdd(const FloatPoint&) const;
73 73
74 OwnPtr<Vector<FloatPoint> > m_vertices; 74 OwnPtr<Vector<FloatPoint>> m_vertices;
75 WindRule m_fillRule; 75 WindRule m_fillRule;
76 FloatRect m_boundingBox; 76 FloatRect m_boundingBox;
77 bool m_empty; 77 bool m_empty;
78 Vector<FloatPolygonEdge> m_edges; 78 Vector<FloatPolygonEdge> m_edges;
79 EdgeIntervalTree m_edgeTree; // Each EdgeIntervalTree node stores minY, maxY , and a ("UserData") pointer to a FloatPolygonEdge. 79 EdgeIntervalTree m_edgeTree; // Each EdgeIntervalTree node stores minY, maxY , and a ("UserData") pointer to a FloatPolygonEdge.
80 80
81 }; 81 };
82 82
83 class PLATFORM_EXPORT VertexPair { 83 class PLATFORM_EXPORT VertexPair {
84 public: 84 public:
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 }; 143 };
144 144
145 template<> struct ValueToString<FloatPolygonEdge*> { 145 template<> struct ValueToString<FloatPolygonEdge*> {
146 static String string(const FloatPolygonEdge* edge) { return String::format(" %p (%f,%f %f,%f)", edge, edge->vertex1().x(), edge->vertex1().y(), edge->vertex2 ().x(), edge->vertex2().y()); } 146 static String string(const FloatPolygonEdge* edge) { return String::format(" %p (%f,%f %f,%f)", edge, edge->vertex1().x(), edge->vertex1().y(), edge->vertex2 ().x(), edge->vertex2().y()); }
147 }; 147 };
148 #endif 148 #endif
149 149
150 } // namespace blink 150 } // namespace blink
151 151
152 #endif // FloatPolygon_h 152 #endif // FloatPolygon_h
OLDNEW
« no previous file with comments | « Source/platform/fonts/win/FontCacheSkiaWin.cpp ('k') | Source/platform/geometry/FloatPolygon.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698