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

Side by Side Diff: third_party/WebKit/Source/core/layout/svg/LayoutSVGTextPath.h

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) 2007 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2009 Apple Inc. All rights reserved. 3 * Copyright (C) 2009 Apple Inc. All rights reserved.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 * Library General Public License for more details. 13 * Library General Public License for more details.
14 * 14 *
15 * You should have received a copy of the GNU Library General Public License 15 * You should have received a copy of the GNU Library General Public License
16 * along with this library; see the file COPYING.LIB. If not, write to 16 * along with this library; see the file COPYING.LIB. If not, write to
17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 * Boston, MA 02110-1301, USA. 18 * Boston, MA 02110-1301, USA.
19 */ 19 */
20 20
21 #ifndef LayoutSVGTextPath_h 21 #ifndef LayoutSVGTextPath_h
22 #define LayoutSVGTextPath_h 22 #define LayoutSVGTextPath_h
23 23
24 #include "core/layout/svg/LayoutSVGInline.h" 24 #include "core/layout/svg/LayoutSVGInline.h"
25 #include "wtf/PtrUtil.h"
26 #include <memory>
25 27
26 namespace blink { 28 namespace blink {
27 29
28 // This class maps a 1D location in the "path space"; [0, path length] to a 30 // This class maps a 1D location in the "path space"; [0, path length] to a
29 // (2D) point on the path and provides the normal (angle from the x-axis) for 31 // (2D) point on the path and provides the normal (angle from the x-axis) for
30 // said point. 32 // said point.
31 class PathPositionMapper { 33 class PathPositionMapper {
32 USING_FAST_MALLOC(PathPositionMapper); 34 USING_FAST_MALLOC(PathPositionMapper);
33 public: 35 public:
34 static PassOwnPtr<PathPositionMapper> create(const Path& path) 36 static std::unique_ptr<PathPositionMapper> create(const Path& path)
35 { 37 {
36 return adoptPtr(new PathPositionMapper(path)); 38 return wrapUnique(new PathPositionMapper(path));
37 } 39 }
38 40
39 enum PositionType { 41 enum PositionType {
40 OnPath, 42 OnPath,
41 BeforePath, 43 BeforePath,
42 AfterPath, 44 AfterPath,
43 }; 45 };
44 PositionType pointAndNormalAtLength(float length, FloatPoint&, float& angle) ; 46 PositionType pointAndNormalAtLength(float length, FloatPoint&, float& angle) ;
45 float length() const { return m_pathLength; } 47 float length() const { return m_pathLength; }
46 48
47 private: 49 private:
48 explicit PathPositionMapper(const Path&); 50 explicit PathPositionMapper(const Path&);
49 51
50 Path::PositionCalculator m_positionCalculator; 52 Path::PositionCalculator m_positionCalculator;
51 float m_pathLength; 53 float m_pathLength;
52 }; 54 };
53 55
54 class LayoutSVGTextPath final : public LayoutSVGInline { 56 class LayoutSVGTextPath final : public LayoutSVGInline {
55 public: 57 public:
56 explicit LayoutSVGTextPath(Element*); 58 explicit LayoutSVGTextPath(Element*);
57 59
58 PassOwnPtr<PathPositionMapper> layoutPath() const; 60 std::unique_ptr<PathPositionMapper> layoutPath() const;
59 float calculateStartOffset(float) const; 61 float calculateStartOffset(float) const;
60 62
61 bool isChildAllowed(LayoutObject*, const ComputedStyle&) const override; 63 bool isChildAllowed(LayoutObject*, const ComputedStyle&) const override;
62 64
63 bool isOfType(LayoutObjectType type) const override { return type == LayoutO bjectSVGTextPath || LayoutSVGInline::isOfType(type); } 65 bool isOfType(LayoutObjectType type) const override { return type == LayoutO bjectSVGTextPath || LayoutSVGInline::isOfType(type); }
64 66
65 const char* name() const override { return "LayoutSVGTextPath"; } 67 const char* name() const override { return "LayoutSVGTextPath"; }
66 }; 68 };
67 69
68 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutSVGTextPath, isSVGTextPath()); 70 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutSVGTextPath, isSVGTextPath());
69 71
70 } // namespace blink 72 } // namespace blink
71 73
72 #endif // LayoutSVGTextPath_h 74 #endif // LayoutSVGTextPath_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698