Simplify the SVGGraphicsElement ...CTM methods

GetCTM() only has a single caller, so can be trivially folded. Similarly
GetScreenCTM which has one kAllowStyleUpdate and one
kDisallowStyleUpdate, so it can be folded while hoisting the call to
update style and layout.
This means that there are no longer a collision between internal methods
and the ones exposed in the DOM, so the "...FromJavascript" suffixes can
be dropped.

Review-Url: https://codereview.chromium.org/2858913002
Cr-Commit-Position: refs/heads/master@{#469055}

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

@@ -228,8 +228,7 @@ Path* LayoutSVGShape::NonScalingStrokePath(
 
 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);

third_party/WebKit/Source/core/svg/SVGGraphicsElement.cpp

@@ -57,11 +57,7 @@ static bool IsViewportElement(const Element& element) {
 
 AffineTransform SVGGraphicsElement::ComputeCTM(
     SVGElement::CTMScope mode,
-    SVGGraphicsElement::StyleUpdateStrategy style_update_strategy,
     const SVGGraphicsElement* ancestor) const {
-  if (style_update_strategy == kAllowStyleUpdate)
-    GetDocument().UpdateStyleAndLayoutIgnorePendingStylesheets();
-
   AffineTransform ctm;
   bool done = false;
 
@@ -88,26 +84,19 @@ AffineTransform SVGGraphicsElement::ComputeCTM(
         break;
     }
   }
-
   return ctm;
 }
 
-AffineTransform SVGGraphicsElement::GetCTM(
-    StyleUpdateStrategy style_update_strategy) {
-  return ComputeCTM(kNearestViewportScope, style_update_strategy);
-}
+SVGMatrixTearOff* SVGGraphicsElement::getCTM() {
+  GetDocument().UpdateStyleAndLayoutIgnorePendingStylesheetsForNode(this);
 
-AffineTransform SVGGraphicsElement::GetScreenCTM(
-    StyleUpdateStrategy style_update_strategy) {
-  return ComputeCTM(kScreenScope, style_update_strategy);
+  return SVGMatrixTearOff::Create(ComputeCTM(kNearestViewportScope));
 }
 
-SVGMatrixTearOff* SVGGraphicsElement::getCTMFromJavascript() {
-  return SVGMatrixTearOff::Create(GetCTM());
-}
+SVGMatrixTearOff* SVGGraphicsElement::getScreenCTM() {
+  GetDocument().UpdateStyleAndLayoutIgnorePendingStylesheetsForNode(this);
 
-SVGMatrixTearOff* SVGGraphicsElement::getScreenCTMFromJavascript() {
-  return SVGMatrixTearOff::Create(GetScreenCTM());
+  return SVGMatrixTearOff::Create(ComputeCTM(kScreenScope));
 }
 
 void SVGGraphicsElement::CollectStyleForPresentationAttribute(

third_party/WebKit/Source/core/svg/SVGGraphicsElement.h

@@ -41,12 +41,8 @@ class CORE_EXPORT SVGGraphicsElement : public SVGElement, public SVGTests {
  public:
   ~SVGGraphicsElement() override;
 
-  enum StyleUpdateStrategy { kAllowStyleUpdate, kDisallowStyleUpdate };
-
-  AffineTransform GetCTM(StyleUpdateStrategy = kAllowStyleUpdate);
-  AffineTransform GetScreenCTM(StyleUpdateStrategy = kAllowStyleUpdate);
-  SVGMatrixTearOff* getCTMFromJavascript();
-  SVGMatrixTearOff* getScreenCTMFromJavascript();
+  SVGMatrixTearOff* getCTM();
+  SVGMatrixTearOff* getScreenCTM();
 
   SVGElement* nearestViewportElement() const;
   SVGElement* farthestViewportElement() const;
@@ -64,8 +60,7 @@ class CORE_EXPORT SVGGraphicsElement : public SVGElement, public SVGTests {
   SVGAnimatedTransformList* transform() { return transform_.Get(); }
   const SVGAnimatedTransformList* transform() const { return transform_.Get(); }
 
-  AffineTransform ComputeCTM(SVGElement::CTMScope mode,
-                             SVGGraphicsElement::StyleUpdateStrategy,
+  AffineTransform ComputeCTM(CTMScope mode,
                              const SVGGraphicsElement* ancestor = 0) const;
 
   DECLARE_VIRTUAL_TRACE();

third_party/WebKit/Source/core/svg/SVGGraphicsElement.idl

@@ -34,8 +34,8 @@ interface SVGGraphicsElement : SVGElement {
     [Measure] readonly attribute SVGAnimatedTransformList transform;
 
     [ImplementedAs=getBBoxFromJavascript] SVGRect getBBox();
-    [ImplementedAs=getCTMFromJavascript] SVGMatrix getCTM();
-    [ImplementedAs=getScreenCTMFromJavascript] SVGMatrix getScreenCTM();
+    SVGMatrix getCTM();
+    SVGMatrix getScreenCTM();
 
     // TODO(foolip): The following two properties existed on SVGLocatable in SVG
     // 1.1, but were removed in SVG2. https://crbug.com/695981

third_party/WebKit/Source/core/svg/SVGSVGElement.cpp

@@ -332,8 +332,8 @@ bool SVGSVGElement::CheckIntersectionOrEnclosure(
   if (!IsIntersectionOrEnclosureTarget(layout_object))
     return false;
 
-  AffineTransform ctm = ToSVGGraphicsElement(element).ComputeCTM(
-      kAncestorScope, kDisallowStyleUpdate, this);
+  AffineTransform ctm =
+      ToSVGGraphicsElement(element).ComputeCTM(kAncestorScope, this);
   FloatRect mapped_repaint_rect =
       ctm.MapRect(layout_object->VisualRectInLocalSVGCoordinates());