Simplify the SVGGraphicsElement ...CTM methods

third_party/WebKit/Source/core/layout/svg/LayoutSVGShape.cpp

 /*
  * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2008 Rob Buis <buis@kde.org>
  * Copyright (C) 2005, 2007 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2009 Google, Inc.
  * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  * Copyright (C) 2009 Jeff Schiller <codedread@gmail.com>
  * Copyright (C) 2011 Renata Hodovan <reni@webkit.org>
  * Copyright (C) 2011 University of Szeged
@@ skipping 210 matching lines @@
     return &rare_data.cached_non_scaling_stroke_path_;
 
   rare_data.cached_non_scaling_stroke_path_ = *path;
   rare_data.cached_non_scaling_stroke_path_.Transform(stroke_transform);
   rare_data.cached_non_scaling_stroke_transform_ = stroke_transform;
   return &rare_data.cached_non_scaling_stroke_path_;
 }
 
 AffineTransform LayoutSVGShape::NonScalingStrokeTransform() const {
   AffineTransform t =
-      ToSVGGraphicsElement(GetElement())
-          ->GetScreenCTM(SVGGraphicsElement::kDisallowStyleUpdate);
+      ToSVGGraphicsElement(GetElement())->ComputeCTM(SVGElement::kScreenScope);
   // Width of non-scaling stroke is independent of translation, so zero it out
   // here.
   t.SetE(0);
   t.SetF(0);
   return t;
 }
 
 void LayoutSVGShape::Paint(const PaintInfo& paint_info,
                            const LayoutPoint&) const {
   SVGShapePainter(*this).Paint(paint_info);
@@ skipping 92 matching lines @@
   return length_context.ValueForLength(Style()->SvgStyle().StrokeWidth());
 }
 
 LayoutSVGShapeRareData& LayoutSVGShape::EnsureRareData() const {
   if (!rare_data_)
     rare_data_ = WTF::MakeUnique<LayoutSVGShapeRareData>();
   return *rare_data_.get();
 }
 
 }  // namespace blink