diff options
| author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
|---|---|---|
| committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
| commit | 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c (patch) | |
| tree | 46dcd36c86e7fbc6e5df36deb463b33e9967a6f7 /Source/WebCore/rendering/svg/SVGTextMetricsBuilder.h | |
| parent | 32761a6cee1d0dee366b885b7b9c777e67885688 (diff) | |
| download | WebKitGtk-tarball-master.tar.gz | |
webkitgtk-2.16.5HEADwebkitgtk-2.16.5master
Diffstat (limited to 'Source/WebCore/rendering/svg/SVGTextMetricsBuilder.h')
| -rw-r--r-- | Source/WebCore/rendering/svg/SVGTextMetricsBuilder.h | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/Source/WebCore/rendering/svg/SVGTextMetricsBuilder.h b/Source/WebCore/rendering/svg/SVGTextMetricsBuilder.h index 5e0d12951..4f7402523 100644 --- a/Source/WebCore/rendering/svg/SVGTextMetricsBuilder.h +++ b/Source/WebCore/rendering/svg/SVGTextMetricsBuilder.h @@ -17,10 +17,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef SVGTextMetricsBuilder_h -#define SVGTextMetricsBuilder_h +#pragma once -#if ENABLE(SVG) #include "SVGTextLayoutAttributes.h" #include "TextRun.h" #include "WidthIterator.h" @@ -36,8 +34,8 @@ class SVGTextMetricsBuilder { WTF_MAKE_NONCOPYABLE(SVGTextMetricsBuilder); public: SVGTextMetricsBuilder(); - void measureTextRenderer(RenderSVGInlineText*); - void buildMetricsAndLayoutAttributes(RenderSVGText*, RenderSVGInlineText* stopAtLeaf, SVGCharacterDataMap& allCharactersMap); + void measureTextRenderer(RenderSVGInlineText&); + void buildMetricsAndLayoutAttributes(RenderSVGText&, RenderSVGInlineText* stopAtLeaf, SVGCharacterDataMap& allCharactersMap); private: bool advance(); @@ -45,9 +43,9 @@ private: void advanceComplexText(); bool currentCharacterStartsSurrogatePair() const; - void initializeMeasurementWithTextRenderer(RenderSVGInlineText*); + void initializeMeasurementWithTextRenderer(RenderSVGInlineText&); void walkTree(RenderElement&, RenderSVGInlineText* stopAtLeaf, MeasureTextData*); - void measureTextRenderer(RenderSVGInlineText*, MeasureTextData*); + void measureTextRenderer(RenderSVGInlineText&, MeasureTextData*); RenderSVGInlineText* m_text; TextRun m_run; @@ -57,13 +55,10 @@ private: float m_totalWidth; // Simple text only. - OwnPtr<WidthIterator> m_simpleWidthIterator; + std::unique_ptr<WidthIterator> m_simpleWidthIterator; // Complex text only. SVGTextMetrics m_complexStartToCurrentMetrics; }; } // namespace WebCore - -#endif // ENABLE(SVG) -#endif |