OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. | 2 * Copyright (C) 2013 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 24 matching lines...) Expand all Loading... |
35 | 35 |
36 namespace blink { | 36 namespace blink { |
37 | 37 |
38 class FloatPolygonTestValue { | 38 class FloatPolygonTestValue { |
39 public: | 39 public: |
40 FloatPolygonTestValue(const float* coordinates, | 40 FloatPolygonTestValue(const float* coordinates, |
41 unsigned coordinatesLength, | 41 unsigned coordinatesLength, |
42 WindRule fillRule) { | 42 WindRule fillRule) { |
43 ASSERT(!(coordinatesLength % 2)); | 43 ASSERT(!(coordinatesLength % 2)); |
44 std::unique_ptr<Vector<FloatPoint>> vertices = | 44 std::unique_ptr<Vector<FloatPoint>> vertices = |
45 wrapUnique(new Vector<FloatPoint>(coordinatesLength / 2)); | 45 WTF::wrapUnique(new Vector<FloatPoint>(coordinatesLength / 2)); |
46 for (unsigned i = 0; i < coordinatesLength; i += 2) | 46 for (unsigned i = 0; i < coordinatesLength; i += 2) |
47 (*vertices)[i / 2] = FloatPoint(coordinates[i], coordinates[i + 1]); | 47 (*vertices)[i / 2] = FloatPoint(coordinates[i], coordinates[i + 1]); |
48 m_polygon = wrapUnique(new FloatPolygon(std::move(vertices), fillRule)); | 48 m_polygon = |
| 49 WTF::wrapUnique(new FloatPolygon(std::move(vertices), fillRule)); |
49 } | 50 } |
50 | 51 |
51 const FloatPolygon& polygon() const { return *m_polygon; } | 52 const FloatPolygon& polygon() const { return *m_polygon; } |
52 | 53 |
53 private: | 54 private: |
54 std::unique_ptr<FloatPolygon> m_polygon; | 55 std::unique_ptr<FloatPolygon> m_polygon; |
55 }; | 56 }; |
56 | 57 |
57 namespace { | 58 namespace { |
58 | 59 |
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
330 EXPECT_FALSE(h.contains(FloatPoint(151, 100))); | 331 EXPECT_FALSE(h.contains(FloatPoint(151, 100))); |
331 EXPECT_FALSE(h.contains(FloatPoint(199, 100))); | 332 EXPECT_FALSE(h.contains(FloatPoint(199, 100))); |
332 EXPECT_FALSE(h.contains(FloatPoint(175, 125))); | 333 EXPECT_FALSE(h.contains(FloatPoint(175, 125))); |
333 EXPECT_FALSE(h.contains(FloatPoint(151, 250))); | 334 EXPECT_FALSE(h.contains(FloatPoint(151, 250))); |
334 EXPECT_FALSE(h.contains(FloatPoint(199, 250))); | 335 EXPECT_FALSE(h.contains(FloatPoint(199, 250))); |
335 EXPECT_FALSE(h.contains(FloatPoint(199, 250))); | 336 EXPECT_FALSE(h.contains(FloatPoint(199, 250))); |
336 EXPECT_FALSE(h.contains(FloatPoint(175, 225))); | 337 EXPECT_FALSE(h.contains(FloatPoint(175, 225))); |
337 } | 338 } |
338 | 339 |
339 } // namespace blink | 340 } // namespace blink |
OLD | NEW |