diff options
| author | Robert Longson <longsonr@gmail.com> | 2018-03-29 03:12:05 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-04-19 11:39:36 +0200 |
| commit | acf95284e7d9b00d4ab1e526dc5f12b4d29bdff1 (patch) | |
| tree | 177bf9ba21e1997671bb0ad0082a2d33ceaccf40 | |
| parent | 1d126c1d566d104a0976992c63c624785825770d (diff) | |
| download | UXP-acf95284e7d9b00d4ab1e526dc5f12b4d29bdff1.tar UXP-acf95284e7d9b00d4ab1e526dc5f12b4d29bdff1.tar.gz UXP-acf95284e7d9b00d4ab1e526dc5f12b4d29bdff1.tar.lz UXP-acf95284e7d9b00d4ab1e526dc5f12b4d29bdff1.tar.xz UXP-acf95284e7d9b00d4ab1e526dc5f12b4d29bdff1.zip | |
Bug 1448774. r=dholbert, a=RyanVM
--HG--
extra : source : edfd9ffbd7208ef0a59f40a0d77d8dd53c905cb9
extra : intermediate-source : 3784b22ec536b08ce95201d73ae8806340c18b8c
| -rw-r--r-- | dom/svg/SVGTextContentElement.h | 1 | ||||
| -rw-r--r-- | layout/svg/SVGTextFrame.cpp | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/dom/svg/SVGTextContentElement.h b/dom/svg/SVGTextContentElement.h index 905468228..5f126c811 100644 --- a/dom/svg/SVGTextContentElement.h +++ b/dom/svg/SVGTextContentElement.h @@ -29,6 +29,7 @@ typedef SVGGraphicsElement SVGTextContentElementBase; class SVGTextContentElement : public SVGTextContentElementBase { + friend class ::SVGTextFrame; public: using FragmentOrElement::TextLength; diff --git a/layout/svg/SVGTextFrame.cpp b/layout/svg/SVGTextFrame.cpp index e68126068..e5a03333f 100644 --- a/layout/svg/SVGTextFrame.cpp +++ b/layout/svg/SVGTextFrame.cpp @@ -5111,8 +5111,8 @@ SVGTextFrame::DoGlyphPositioning() float actualTextLength = static_cast<float>(presContext->AppUnitsToGfxUnits(frameLength) * factor); - RefPtr<SVGAnimatedEnumeration> lengthAdjustEnum = element->LengthAdjust(); - uint16_t lengthAdjust = lengthAdjustEnum->AnimVal(); + uint16_t lengthAdjust = + element->EnumAttributes()[SVGTextContentElement::LENGTHADJUST].GetAnimValue(); switch (lengthAdjust) { case SVG_LENGTHADJUST_SPACINGANDGLYPHS: // Scale the glyphs and their positions. |