webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 6 insertions, 10 deletions

diff --git a/Source/WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.h b/Source/WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.h
index 5aa60e923..99c5f422d 100644
--- a/Source/WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.h
+++ b/Source/WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.h
@@ -17,14 +17,13 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef SVGTextLayoutAttributesBuilder_h
-#define SVGTextLayoutAttributesBuilder_h
+#pragma once
 
-#if ENABLE(SVG)
 #include "SVGTextMetricsBuilder.h"
 
 namespace WebCore {
 
+class RenderBoxModelObject;
 class RenderObject;
 class RenderSVGInlineText;
 class RenderSVGText;
@@ -42,10 +41,10 @@ class SVGTextLayoutAttributesBuilder {
     WTF_MAKE_NONCOPYABLE(SVGTextLayoutAttributesBuilder);
 public:
     SVGTextLayoutAttributesBuilder();
-    bool buildLayoutAttributesForForSubtree(RenderSVGText*);
+    bool buildLayoutAttributesForForSubtree(RenderSVGText&);
     void buildLayoutAttributesForTextRenderer(RenderSVGInlineText&);
 
-    void rebuildMetricsForTextRenderer(RenderSVGInlineText*);
+    void rebuildMetricsForTextRenderer(RenderSVGInlineText&);
 
     // Invoked whenever the underlying DOM tree changes, so that m_textPositions is rebuild.
     void clearTextPositioningElements() { m_textPositions.clear(); }
@@ -65,8 +64,8 @@ private:
         unsigned length;
     };
 
-    void buildCharacterDataMap(RenderSVGText*);
-    void collectTextPositioningElements(RenderObject*, const UChar*& lastCharacter);
+    void buildCharacterDataMap(RenderSVGText&);
+    void collectTextPositioningElements(RenderBoxModelObject&, bool& lastCharacterWasSpace);
     void fillCharacterDataMap(const TextPosition&);
 
 private:
@@ -77,6 +76,3 @@ private:
 };
 
 } // namespace WebCore
-
-#endif // ENABLE(SVG)
-#endif