| Index: Source/core/rendering/svg/SVGTextLayoutAttributesBuilder.cpp
|
| diff --git a/Source/core/rendering/svg/SVGTextLayoutAttributesBuilder.cpp b/Source/core/rendering/svg/SVGTextLayoutAttributesBuilder.cpp
|
| index 778acbc6840e4cc565da48f4bcba45c6fa1794ba..c325613d57502a13df88663e205e3179ccf4967c 100644
|
| --- a/Source/core/rendering/svg/SVGTextLayoutAttributesBuilder.cpp
|
| +++ b/Source/core/rendering/svg/SVGTextLayoutAttributesBuilder.cpp
|
| @@ -23,6 +23,7 @@
|
|
|
| #include "core/rendering/svg/RenderSVGInlineText.h"
|
| #include "core/rendering/svg/RenderSVGText.h"
|
| +#include "core/rendering/svg/SVGTextMetricsBuilder.h"
|
| #include "core/svg/SVGTextPositioningElement.h"
|
|
|
| namespace WebCore {
|
| @@ -53,7 +54,7 @@ void SVGTextLayoutAttributesBuilder::buildLayoutAttributesForTextRenderer(Render
|
| buildCharacterDataMap(textRoot);
|
| }
|
|
|
| - m_metricsBuilder.buildMetricsAndLayoutAttributes(textRoot, text, m_characterDataMap);
|
| + SVGTextMetricsBuilder::buildMetricsAndLayoutAttributes(textRoot, text, m_characterDataMap);
|
| }
|
|
|
| bool SVGTextLayoutAttributesBuilder::buildLayoutAttributesForForSubtree(RenderSVGText* textRoot)
|
| @@ -72,14 +73,14 @@ bool SVGTextLayoutAttributesBuilder::buildLayoutAttributesForForSubtree(RenderSV
|
| return false;
|
|
|
| buildCharacterDataMap(textRoot);
|
| - m_metricsBuilder.buildMetricsAndLayoutAttributes(textRoot, 0, m_characterDataMap);
|
| + SVGTextMetricsBuilder::buildMetricsAndLayoutAttributes(textRoot, 0, m_characterDataMap);
|
| return true;
|
| }
|
|
|
| void SVGTextLayoutAttributesBuilder::rebuildMetricsForTextRenderer(RenderSVGInlineText* text)
|
| {
|
| ASSERT(text);
|
| - m_metricsBuilder.measureTextRenderer(text);
|
| + SVGTextMetricsBuilder::measureTextRenderer(text);
|
| }
|
|
|
| static inline void processRenderSVGInlineText(RenderSVGInlineText* text, unsigned& atCharacter, UChar& lastCharacter)
|
|
|