From 2bde8e466a4451c7319e3a072d118917957d6554 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 25 May 2011 19:08:45 +0100 Subject: Merge WebKit at r82507: Initial merge by git Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e --- Source/WebCore/rendering/svg/SVGTextFragment.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'Source/WebCore/rendering/svg/SVGTextFragment.h') 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; -- cgit v1.1