diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:05:15 -0800 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:05:15 -0800 |
commit | 1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353 (patch) | |
tree | 4457a7306ea5acb43fe05bfe0973b1f7faf97ba2 /WebCore/rendering/SVGCharacterLayoutInfo.cpp | |
parent | 9364f22aed35e1a1e9d07c121510f80be3ab0502 (diff) | |
download | external_webkit-1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353.zip external_webkit-1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353.tar.gz external_webkit-1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353.tar.bz2 |
Code drop from //branches/cupcake/...@124589
Diffstat (limited to 'WebCore/rendering/SVGCharacterLayoutInfo.cpp')
-rw-r--r-- | WebCore/rendering/SVGCharacterLayoutInfo.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/WebCore/rendering/SVGCharacterLayoutInfo.cpp b/WebCore/rendering/SVGCharacterLayoutInfo.cpp index 5cad6d9..287aeac 100644 --- a/WebCore/rendering/SVGCharacterLayoutInfo.cpp +++ b/WebCore/rendering/SVGCharacterLayoutInfo.cpp @@ -315,10 +315,10 @@ void SVGCharacterLayoutInfo::addLayoutInformation(SVGTextPositioningElement* ele float baselineShift = calculateBaselineShift(element->renderer()); - addStackContent(XStack, element->x()); - addStackContent(YStack, element->y()); - addStackContent(DxStack, element->dx()); - addStackContent(DyStack, element->dy()); + addStackContent(XStack, element->x(), element); + addStackContent(YStack, element->y(), element); + addStackContent(DxStack, element->dx(), element); + addStackContent(DyStack, element->dy(), element); addStackContent(AngleStack, element->rotate()); addStackContent(BaselineShiftStack, baselineShift); @@ -352,7 +352,7 @@ void SVGCharacterLayoutInfo::addStackContent(StackType type, SVGNumberList* list addStackContent(type, newLayoutInfo); } -void SVGCharacterLayoutInfo::addStackContent(StackType type, SVGLengthList* list) +void SVGCharacterLayoutInfo::addStackContent(StackType type, SVGLengthList* list, const SVGElement* context) { unsigned length = list->numberOfItems(); if (!length) @@ -362,7 +362,7 @@ void SVGCharacterLayoutInfo::addStackContent(StackType type, SVGLengthList* list ExceptionCode ec = 0; for (unsigned i = 0; i < length; ++i) { - float value = list->getItem(i, ec).value(); + float value = list->getItem(i, ec).value(context); ASSERT(ec == 0); newLayoutInfo.append(value); |