From 1d126c1d566d104a0976992c63c624785825770d Mon Sep 17 00:00:00 2001
From: Botond Ballo <botond@mozilla.com>
Date: Fri, 9 Mar 2018 17:26:24 -0500
Subject: Bug 1443092 - Avoid calling SVGAnimatedEnumeration::AnimVal() from
 nsSVGUtils::GetBBox(). r=jwatt, a=RyanVM

AnimVal() is a DOM getter, and it flushes animations, which we don't want
in GetBBox() which is called from display list building cide and
FrameLayerBuilder.

MozReview-Commit-ID: DWgm7wAV7C0
---
 layout/svg/nsSVGUtils.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'layout/svg')

diff --git a/layout/svg/nsSVGUtils.cpp b/layout/svg/nsSVGUtils.cpp
index ff74d5baf..344ebf645 100644
--- a/layout/svg/nsSVGUtils.cpp
+++ b/layout/svg/nsSVGUtils.cpp
@@ -1127,8 +1127,7 @@ nsSVGUtils::GetBBox(nsIFrame *aFrame, uint32_t aFlags)
       if (clipPathFrame && isOK) {
         SVGClipPathElement *clipContent = 
           static_cast<SVGClipPathElement*>(clipPathFrame->GetContent());
-        RefPtr<SVGAnimatedEnumeration> units = clipContent->ClipPathUnits();
-        if (units->AnimVal() == SVG_UNIT_TYPE_OBJECTBOUNDINGBOX) {
+        if (clipContent->IsUnitsObjectBoundingBox()) {
           matrix.Translate(gfxPoint(x, y));
           matrix.Scale(width, height);
         } else if (aFrame->GetType() == nsGkAtoms::svgForeignObjectFrame) {
-- 
cgit v1.2.3


From acf95284e7d9b00d4ab1e526dc5f12b4d29bdff1 Mon Sep 17 00:00:00 2001
From: Robert Longson <longsonr@gmail.com>
Date: Thu, 29 Mar 2018 03:12:05 +0100
Subject: Bug 1448774. r=dholbert, a=RyanVM

--HG--
extra : source : edfd9ffbd7208ef0a59f40a0d77d8dd53c905cb9
extra : intermediate-source : 3784b22ec536b08ce95201d73ae8806340c18b8c
---
 layout/svg/SVGTextFrame.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'layout/svg')

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.
-- 
cgit v1.2.3