Rework SVGViewSpec<->SVGSVGElement integration

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

 /*
  * Copyright (C) 2004, 2005, 2006 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2010 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 20 matching lines @@
 
 namespace blink {
 
 class SMILTimeContainer;
 class SVGAngleTearOff;
 class SVGLengthTearOff;
 class SVGMatrixTearOff;
 class SVGNumberTearOff;
 class SVGPointTearOff;
 class SVGTransformTearOff;
-class SVGViewElement;
 class SVGViewSpec;
 
 class SVGSVGElement final : public SVGGraphicsElement,
                             public SVGFitToViewBox,
                             public SVGZoomAndPan {
   DEFINE_WRAPPERTYPEINFO();
   USING_GARBAGE_COLLECTED_MIXIN(SVGSVGElement);
 
  public:
   DECLARE_NODE_FACTORY(SVGSVGElement);
@@ skipping 52 matching lines @@
   bool hasIntrinsicWidth() const;
   bool hasIntrinsicHeight() const;
 
   SVGAnimatedLength* x() const { return m_x.get(); }
   SVGAnimatedLength* y() const { return m_y.get(); }
   SVGAnimatedLength* width() const { return m_width.get(); }
   SVGAnimatedLength* height() const { return m_height.get(); }
 
   DECLARE_VIRTUAL_TRACE();
 
+  SVGViewSpec* viewSpec() const { return m_viewSpec; }
+  void setViewSpec(SVGViewSpec*);
+
  private:
   explicit SVGSVGElement(Document&);
   ~SVGSVGElement() override;
 
   SVGViewSpec& ensureViewSpec();
 
   void parseAttribute(const QualifiedName&,
                       const AtomicString&,
                       const AtomicString&) override;
   bool isPresentationAttribute(const QualifiedName&) const override;
   bool isPresentationAttributeWithSVGDOM(const QualifiedName&) const override;
   void collectStyleForPresentationAttribute(const QualifiedName&,
                                             const AtomicString&,
                                             MutableStylePropertySet*) override;
 
   bool layoutObjectIsNeeded(const ComputedStyle&) override;
   LayoutObject* createLayoutObject(const ComputedStyle&) override;
 
   InsertionNotificationRequest insertedInto(ContainerNode*) override;
   void removedFrom(ContainerNode*) override;
 
   void svgAttributeChanged(const QualifiedName&) override;
 
   bool selfHasRelativeLengths() const override;
 
-  void inheritViewAttributes(SVGViewElement*);
-
   bool shouldSynthesizeViewBox() const;
   void updateUserTransform();
 
   void finishParsingChildren() override;
 
   enum CheckIntersectionOrEnclosure { CheckIntersection, CheckEnclosure };
 
   bool checkIntersectionOrEnclosure(const SVGElement&,
                                     const FloatRect&,
                                     CheckIntersectionOrEnclosure) const;
   StaticNodeList* collectIntersectionOrEnclosureList(
       const FloatRect&,
       SVGElement*,
       CheckIntersectionOrEnclosure) const;
 
   Member<SVGAnimatedLength> m_x;
   Member<SVGAnimatedLength> m_y;
   Member<SVGAnimatedLength> m_width;
   Member<SVGAnimatedLength> m_height;
 
   AffineTransform localCoordinateSpaceTransform(
       SVGElement::CTMScope) const override;
 
-  bool m_useCurrentView;
   Member<SMILTimeContainer> m_timeContainer;
   Member<SVGPoint> m_translation;
   Member<SVGViewSpec> m_viewSpec;
   float m_currentScale;
 
   friend class SVGCurrentTranslateTearOff;
 };
 
 }  // namespace blink
 
 #endif  // SVGSVGElement_h