Simplify the SVGGraphicsElement ...CTM methods

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

 /*
  * Copyright (C) 2004, 2005, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
  * Copyright (C) 2014 Google, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 39 matching lines @@
   SVGTests::Trace(visitor);
 }
 
 static bool IsViewportElement(const Element& element) {
   return (isSVGSVGElement(element) || isSVGSymbolElement(element) ||
           isSVGForeignObjectElement(element) || isSVGImageElement(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;
 
   for (const Element* current_element = this; current_element && !done;
        current_element = current_element->ParentOrShadowHostElement()) {
     if (!current_element->IsSVGElement())
       break;
 
     ctm = ToSVGElement(current_element)
               ->LocalCoordinateSpaceTransform(mode)
               .Multiply(ctm);
 
     switch (mode) {
       case kNearestViewportScope:
         // Stop at the nearest viewport ancestor.
         done = current_element != this && IsViewportElement(*current_element);
         break;
       case kAncestorScope:
         // Stop at the designated ancestor.
         done = current_element == ancestor;
         break;
       default:
         DCHECK_EQ(mode, kScreenScope);
         break;
     }
   }
-
   return ctm;
 }
 
-AffineTransform SVGGraphicsElement::GetCTM(
-    StyleUpdateStrategy style_update_strategy) {
-  return ComputeCTM(kNearestViewportScope, style_update_strategy);
+SVGMatrixTearOff* SVGGraphicsElement::getCTM() {
+  GetDocument().UpdateStyleAndLayoutIgnorePendingStylesheetsForNode(this);
+
+  return SVGMatrixTearOff::Create(ComputeCTM(kNearestViewportScope));
 }
 
-AffineTransform SVGGraphicsElement::GetScreenCTM(
-    StyleUpdateStrategy style_update_strategy) {
-  return ComputeCTM(kScreenScope, style_update_strategy);
-}
+SVGMatrixTearOff* SVGGraphicsElement::getScreenCTM() {
+  GetDocument().UpdateStyleAndLayoutIgnorePendingStylesheetsForNode(this);
 
-SVGMatrixTearOff* SVGGraphicsElement::getCTMFromJavascript() {
-  return SVGMatrixTearOff::Create(GetCTM());
-}
-
-SVGMatrixTearOff* SVGGraphicsElement::getScreenCTMFromJavascript() {
-  return SVGMatrixTearOff::Create(GetScreenCTM());
+  return SVGMatrixTearOff::Create(ComputeCTM(kScreenScope));
 }
 
 void SVGGraphicsElement::CollectStyleForPresentationAttribute(
     const QualifiedName& name,
     const AtomicString& value,
     MutableStylePropertySet* style) {
   if (name == SVGNames::transformAttr) {
     AddPropertyToPresentationAttributeStyle(
         style, CSSPropertyTransform, transform_->CurrentValue()->CssValue());
     return;
@@ skipping 60 matching lines @@
 
   return GetLayoutObject()->ObjectBoundingBox();
 }
 
 SVGRectTearOff* SVGGraphicsElement::getBBoxFromJavascript() {
   return SVGRectTearOff::Create(SVGRect::Create(GetBBox()), 0,
                                 kPropertyIsNotAnimVal);
 }
 
 }  // namespace blink