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

Side by Side Diff: third_party/WebKit/Source/platform/geometry/FloatPolygon.cpp

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 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 12 matching lines...) Expand all
23 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 23 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
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 #include "platform/geometry/FloatPolygon.h" 30 #include "platform/geometry/FloatPolygon.h"
31 31
32 #include "wtf/MathExtras.h" 32 #include "wtf/MathExtras.h"
33 #include <memory>
33 34
34 namespace blink { 35 namespace blink {
35 36
36 static inline float determinant(const FloatSize& a, const FloatSize& b) 37 static inline float determinant(const FloatSize& a, const FloatSize& b)
37 { 38 {
38 return a.width() * b.height() - a.height() * b.width(); 39 return a.width() * b.height() - a.height() * b.width();
39 } 40 }
40 41
41 static inline bool areCollinearPoints(const FloatPoint& p0, const FloatPoint& p1 , const FloatPoint& p2) 42 static inline bool areCollinearPoints(const FloatPoint& p0, const FloatPoint& p1 , const FloatPoint& p2)
42 { 43 {
(...skipping 28 matching lines...) Expand all
71 while (vertexIndex2) { 72 while (vertexIndex2) {
72 unsigned vertexIndex3 = nextVertexIndex(vertexIndex2, nVertices, clockwi se); 73 unsigned vertexIndex3 = nextVertexIndex(vertexIndex2, nVertices, clockwi se);
73 if (!areCollinearPoints(polygon.vertexAt(vertexIndex1), polygon.vertexAt (vertexIndex2), polygon.vertexAt(vertexIndex3))) 74 if (!areCollinearPoints(polygon.vertexAt(vertexIndex1), polygon.vertexAt (vertexIndex2), polygon.vertexAt(vertexIndex3)))
74 break; 75 break;
75 vertexIndex2 = vertexIndex3; 76 vertexIndex2 = vertexIndex3;
76 } 77 }
77 78
78 return vertexIndex2; 79 return vertexIndex2;
79 } 80 }
80 81
81 FloatPolygon::FloatPolygon(PassOwnPtr<Vector<FloatPoint>> vertices, WindRule fil lRule) 82 FloatPolygon::FloatPolygon(std::unique_ptr<Vector<FloatPoint>> vertices, WindRul e fillRule)
82 : m_vertices(std::move(vertices)) 83 : m_vertices(std::move(vertices))
83 , m_fillRule(fillRule) 84 , m_fillRule(fillRule)
84 { 85 {
85 unsigned nVertices = numberOfVertices(); 86 unsigned nVertices = numberOfVertices();
86 m_edges.resize(nVertices); 87 m_edges.resize(nVertices);
87 m_empty = nVertices < 3; 88 m_empty = nVertices < 3;
88 89
89 if (nVertices) 90 if (nVertices)
90 m_boundingBox.setLocation(vertexAt(0)); 91 m_boundingBox.setLocation(vertexAt(0));
91 92
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 float uOtherLine = determinant(thisDelta, vertex1Delta) / denominator; 218 float uOtherLine = determinant(thisDelta, vertex1Delta) / denominator;
218 219
219 if (uThisLine < 0 || uOtherLine < 0 || uThisLine > 1 || uOtherLine > 1) 220 if (uThisLine < 0 || uOtherLine < 0 || uThisLine > 1 || uOtherLine > 1)
220 return false; 221 return false;
221 222
222 point = vertex1() + uThisLine * thisDelta; 223 point = vertex1() + uThisLine * thisDelta;
223 return true; 224 return true;
224 } 225 }
225 226
226 } // namespace blink 227 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698