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

Side by Side Diff: third_party/WebKit/Source/core/layout/svg/SVGTextLayoutEngine.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) Research In Motion Limited 2010-2012. All rights reserved. 2 * Copyright (C) Research In Motion Limited 2010-2012. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12 * Library General Public License for more details. 12 * Library General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU Library General Public License 14 * You should have received a copy of the GNU Library General Public License
15 * along with this library; see the file COPYING.LIB. If not, write to 15 * along with this library; see the file COPYING.LIB. If not, write to
16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
17 * Boston, MA 02110-1301, USA. 17 * Boston, MA 02110-1301, USA.
18 */ 18 */
19 19
20 #ifndef SVGTextLayoutEngine_h 20 #ifndef SVGTextLayoutEngine_h
21 #define SVGTextLayoutEngine_h 21 #define SVGTextLayoutEngine_h
22 22
23 #include "core/layout/api/LineLayoutSVGInlineText.h" 23 #include "core/layout/api/LineLayoutSVGInlineText.h"
24 #include "core/layout/svg/LayoutSVGInlineText.h" 24 #include "core/layout/svg/LayoutSVGInlineText.h"
25 #include "core/layout/svg/SVGTextFragment.h" 25 #include "core/layout/svg/SVGTextFragment.h"
26 #include "wtf/Allocator.h" 26 #include "wtf/Allocator.h"
27 #include "wtf/Vector.h" 27 #include "wtf/Vector.h"
28 #include <memory>
28 29
29 namespace blink { 30 namespace blink {
30 31
31 class ComputedStyle; 32 class ComputedStyle;
32 class InlineFlowBox; 33 class InlineFlowBox;
33 class LayoutObject; 34 class LayoutObject;
34 class PathPositionMapper; 35 class PathPositionMapper;
35 class SVGInlineFlowBox; 36 class SVGInlineFlowBox;
36 class SVGInlineTextBox; 37 class SVGInlineTextBox;
37 class SVGTextMetrics; 38 class SVGTextMetrics;
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 Vector<SVGInlineTextBox*> m_lineLayoutBoxes; 82 Vector<SVGInlineTextBox*> m_lineLayoutBoxes;
82 83
83 SVGTextFragment m_currentTextFragment; 84 SVGTextFragment m_currentTextFragment;
84 SVGInlineTextMetricsIterator m_visualMetricsIterator; 85 SVGInlineTextMetricsIterator m_visualMetricsIterator;
85 FloatPoint m_textPosition; 86 FloatPoint m_textPosition;
86 bool m_isVerticalText; 87 bool m_isVerticalText;
87 bool m_inPathLayout; 88 bool m_inPathLayout;
88 bool m_textLengthSpacingInEffect; 89 bool m_textLengthSpacingInEffect;
89 90
90 // Text on path layout 91 // Text on path layout
91 OwnPtr<PathPositionMapper> m_textPath; 92 std::unique_ptr<PathPositionMapper> m_textPath;
92 float m_textPathStartOffset; 93 float m_textPathStartOffset;
93 float m_textPathCurrentOffset; 94 float m_textPathCurrentOffset;
94 float m_textPathDisplacement; 95 float m_textPathDisplacement;
95 float m_textPathSpacing; 96 float m_textPathSpacing;
96 float m_textPathScaling; 97 float m_textPathScaling;
97 }; 98 };
98 99
99 } // namespace blink 100 } // namespace blink
100 101
101 #endif 102 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698