Cleanup after removal of the SVGViewSpec interface

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

 /*
  * Copyright (C) 2004, 2005, 2006 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2010 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Apple Inc. All rights reserved.
  * 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 83 matching lines @@
   addToPropertyMap(m_width);
   addToPropertyMap(m_height);
 
   UseCounter::count(doc, UseCounter::SVGSVGElement);
 }
 
 DEFINE_NODE_FACTORY(SVGSVGElement)
 
 SVGSVGElement::~SVGSVGElement() {}
 
-SVGViewSpec* SVGSVGElement::currentView() {
+SVGViewSpec& SVGSVGElement::ensureViewSpec() {
   if (!m_viewSpec)
-    m_viewSpec = SVGViewSpec::create(this);
-  return m_viewSpec;
+    m_viewSpec = SVGViewSpec::create();
+  return *m_viewSpec;
 }
 
 float SVGSVGElement::currentScale() const {
   if (!isConnected() || !isOutermostSVGSVGElement())
     return 1;
 
   return m_currentScale;
 }
 
 void SVGSVGElement::setCurrentScale(float scale) {
@@ skipping 32 matching lines @@
   updateUserTransform();
 }
 
 void SVGSVGElement::updateUserTransform() {
   if (LayoutObject* object = layoutObject())
     object->setNeedsLayoutAndFullPaintInvalidation(
         LayoutInvalidationReason::Unknown);
 }
 
 bool SVGSVGElement::zoomAndPanEnabled() const {
-  const SVGZoomAndPan* currentViewSpec = this;
+  SVGZoomAndPanType zoomAndPan = this->zoomAndPan();
   if (m_useCurrentView)
-    currentViewSpec = m_viewSpec;
-  DCHECK(currentViewSpec);
-  return currentViewSpec->zoomAndPan() == SVGZoomAndPanMagnify;
+    zoomAndPan = m_viewSpec->zoomAndPan();
+  return zoomAndPan == SVGZoomAndPanMagnify;
 }
 
 void SVGSVGElement::parseAttribute(const QualifiedName& name,
                                    const AtomicString& oldValue,
                                    const AtomicString& value) {
   if (!nearestViewportElement()) {
     bool setListener = true;
 
     // Only handle events if we're the outermost <svg> element
     if (name == HTMLNames::onunloadAttr) {
@@ skipping 418 matching lines @@
 }
 
 bool SVGSVGElement::shouldSynthesizeViewBox() const {
   return layoutObject() && layoutObject()->isSVGRoot() &&
          toLayoutSVGRoot(layoutObject())->isEmbeddedThroughSVGImage();
 }
 
 FloatRect SVGSVGElement::currentViewBoxRect() const {
   if (m_useCurrentView) {
     DCHECK(m_viewSpec);
-    return m_viewSpec->viewBox()->currentValue()->value();
+    return m_viewSpec->viewBox()->value();
   }
 
   FloatRect useViewBox = viewBox()->currentValue()->value();
   if (!useViewBox.isEmpty())
     return useViewBox;
   if (!shouldSynthesizeViewBox())
     return FloatRect();
 
   // If no viewBox is specified but non-relative width/height values, then we
   // should always synthesize a viewBox if we're embedded through a SVGImage.
   FloatSize synthesizedViewBoxSize(intrinsicWidth(), intrinsicHeight());
   if (!hasIntrinsicWidth())
     synthesizedViewBoxSize.setWidth(width()->currentValue()->scaleByPercentage(
         currentViewportSize().width()));
   if (!hasIntrinsicHeight())
     synthesizedViewBoxSize.setHeight(
         height()->currentValue()->scaleByPercentage(
             currentViewportSize().height()));
   return FloatRect(FloatPoint(), synthesizedViewBoxSize);
 }
 
 SVGPreserveAspectRatio* SVGSVGElement::currentPreserveAspectRatio() const {
   if (m_useCurrentView) {
     DCHECK(m_viewSpec);
-    return m_viewSpec->preserveAspectRatio()->currentValue();
+    return m_viewSpec->preserveAspectRatio();
   }
   if (!viewBox()->currentValue()->isValid() && shouldSynthesizeViewBox()) {
     // If no viewBox is specified and we're embedded through SVGImage, then
     // synthesize a pAR with the value 'none'.
     SVGPreserveAspectRatio* synthesizedPAR = SVGPreserveAspectRatio::create();
     synthesizedPAR->setAlign(
         SVGPreserveAspectRatio::kSvgPreserveaspectratioNone);
     return synthesizedPAR;
   }
   return preserveAspectRatio()->currentValue();
@@ skipping 68 matching lines @@
                                      Element* anchorNode) {
   if (m_viewSpec)
     m_viewSpec->reset();
 
   // If we previously had a view, we need to layout again, regardless of the
   // state after setting.
   bool needsViewUpdate = m_useCurrentView;
   m_useCurrentView = false;
 
   if (fragmentIdentifier.startsWith("svgView(")) {
-    SVGViewSpec* view =
-        currentView();  // Ensure the SVGViewSpec has been created.
+    // Ensure the SVGViewSpec has been created.
+    SVGViewSpec& view = ensureViewSpec();
+    view.inheritViewAttributesFromElement(this);
 
-    view->inheritViewAttributesFromElement(this);
-
-    if (view->parseViewSpec(fragmentIdentifier)) {
+    if (view.parseViewSpec(fragmentIdentifier)) {
       UseCounter::count(document(), UseCounter::SVGSVGElementFragmentSVGView);
       m_useCurrentView = true;
       needsViewUpdate = true;
     } else {
-      view->reset();
+      view.reset();
     }
   } else if (isSVGViewElement(anchorNode)) {
     // Spec: If the SVG fragment identifier addresses a 'view' element
     // within an SVG document (e.g., MyDrawing.svg#MyView or
     // MyDrawing.svg#xpointer(id('MyView'))) then the closest ancestor
     // 'svg' element is displayed in the viewport.  Any view specification
     // attributes included on the given 'view' element override the
     // corresponding view specification attributes on the closest ancestor
     // 'svg' element.
     // TODO(ed): The spec text above is a bit unclear.
@@ skipping 18 matching lines @@
     markForLayoutAndParentResourceInvalidation(layoutObject);
 
   // If m_useCurrentView is true we should have a view-spec.
   DCHECK(!m_useCurrentView || m_viewSpec);
 
   // FIXME: We need to decide which <svg> to focus on, and zoom to it.
   // FIXME: We need to actually "highlight" the viewTarget(s).
 }
 
 void SVGSVGElement::inheritViewAttributes(SVGViewElement* viewElement) {
-  SVGViewSpec* view = currentView();
+  SVGViewSpec& view = ensureViewSpec();
   m_useCurrentView = true;
   UseCounter::count(document(),
                     UseCounter::SVGSVGElementFragmentSVGViewElement);
-  view->inheritViewAttributesFromElement(this);
-  view->inheritViewAttributesFromElement(viewElement);
+  view.inheritViewAttributesFromElement(this);
+  view.inheritViewAttributesFromElement(viewElement);
   DCHECK(!m_useCurrentView || m_viewSpec);
 }
 
 void SVGSVGElement::finishParsingChildren() {
   SVGGraphicsElement::finishParsingChildren();
 
   // The outermost SVGSVGElement SVGLoad event is fired through
   // LocalDOMWindow::dispatchWindowLoadEvent.
   if (isOutermostSVGSVGElement())
     return;
@@ skipping 10 matching lines @@
   visitor->trace(m_width);
   visitor->trace(m_height);
   visitor->trace(m_translation);
   visitor->trace(m_timeContainer);
   visitor->trace(m_viewSpec);
   SVGGraphicsElement::trace(visitor);
   SVGFitToViewBox::trace(visitor);
 }
 
 }  // namespace blink