Merge WebKit at r67908: Initial merge by Git

Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972

1 files changed, 8 insertions, 2 deletions

diff --git a/WebCore/rendering/RenderSVGInlineText.h b/WebCore/rendering/RenderSVGInlineText.h
index 08b4a47..f606918 100644
--- a/WebCore/rendering/RenderSVGInlineText.h
+++ b/WebCore/rendering/RenderSVGInlineText.h
@@ -26,14 +26,18 @@
 #define RenderSVGInlineText_h
 
 #if ENABLE(SVG)
-
 #include "RenderText.h"
+#include "SVGTextLayoutAttributes.h"
 
 namespace WebCore {
+
 class RenderSVGInlineText : public RenderText {
 public:
     RenderSVGInlineText(Node*, PassRefPtr<StringImpl>);
 
+    bool characterStartsNewTextChunk(int position) const;
+    void storeLayoutAttributes(const SVGTextLayoutAttributes& attributes) { m_attributes = attributes; }
+
 private:
     virtual const char* renderName() const { return "RenderSVGInlineText"; }
 
@@ -47,8 +51,10 @@ private:
     virtual bool isSVGInlineText() const { return true; }
 
     virtual IntRect localCaretRect(InlineBox*, int caretOffset, int* extraWidthToEndOfLine = 0);
-
+    virtual IntRect linesBoundingBox() const;
     virtual InlineTextBox* createTextBox();
+
+    SVGTextLayoutAttributes m_attributes;
 };
 
 }