Merge WebKit at r82507: Initial merge by git

Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e

1 files changed, 5 insertions, 3 deletions

diff --git a/Source/WebCore/rendering/svg/SVGTextFragment.h b/Source/WebCore/rendering/svg/SVGTextFragment.h
index 2e520da..b5b3c57 100644
--- a/Source/WebCore/rendering/svg/SVGTextFragment.h
+++ b/Source/WebCore/rendering/svg/SVGTextFragment.h
@@ -28,7 +28,8 @@ namespace WebCore {
 // A SVGTextFragment describes a text fragment of a RenderSVGInlineText which can be rendered at once.
 struct SVGTextFragment {
     SVGTextFragment()
-        : positionListOffset(0)
+        : characterOffset(0)
+        , metricsListOffset(0)
         , length(0)
         , x(0)
         , y(0)
@@ -37,8 +38,9 @@ struct SVGTextFragment {
     {
     }
 
-    // The first rendered character starts at RenderSVGInlineText::characters() + positionListOffset.
-    unsigned positionListOffset;
+    // The first rendered character starts at RenderSVGInlineText::characters() + characterOffset.
+    unsigned characterOffset;
+    unsigned metricsListOffset;
     unsigned length;
 
     float x;