Support currentScale for embedded SVG

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 51 matching lines @@
 inline SVGSVGElement::SVGSVGElement(Document& doc)
     : SVGGraphicsElement(SVGNames::svgTag, doc)
     , SVGFitToViewBox(this)
     , m_x(SVGAnimatedLength::create(this, SVGNames::xAttr, SVGLength::create(SVGLengthMode::Width)))
     , m_y(SVGAnimatedLength::create(this, SVGNames::yAttr, SVGLength::create(SVGLengthMode::Height)))
     , m_width(SVGAnimatedLength::create(this, SVGNames::widthAttr, SVGLength::create(SVGLengthMode::Width)))
     , m_height(SVGAnimatedLength::create(this, SVGNames::heightAttr, SVGLength::create(SVGLengthMode::Height)))
     , m_useCurrentView(false)
     , m_timeContainer(SMILTimeContainer::create(*this))
     , m_translation(SVGPoint::create())
+    , m_currentScale(1)
 {
     m_width->setDefaultValueAsString("100%");
     m_height->setDefaultValueAsString("100%");
 
     addToPropertyMap(m_x);
     addToPropertyMap(m_y);
     addToPropertyMap(m_width);
     addToPropertyMap(m_height);
 
     UseCounter::count(doc, UseCounter::SVGSVGElement);
@@ skipping 29 matching lines @@
     if (!m_viewSpec)
         m_viewSpec = SVGViewSpec::create(this);
     return m_viewSpec.get();
 }
 
 float SVGSVGElement::currentScale() const
 {
     if (!inDocument() || !isOutermostSVGSVGElement())
         return 1;
 
-    LocalFrame* frame = document().frame();
-    if (!frame)
-        return 1;
-
-    const FrameTree& frameTree = frame->tree();
-
-    // The behaviour of currentScale() is undefined, when we're dealing with non-standalone SVG documents.
-    // If the svg is embedded, the scaling is handled by the host layoutObject, so when asking from inside
-    // the SVG document, a scale value of 1 seems reasonable, as it doesn't know anything about the parent scale.
-    return frameTree.parent() ? 1 : frame->pageZoomFactor();
+    return m_currentScale;
 }
 
 void SVGSVGElement::setCurrentScale(float scale)
 {
     ASSERT(std::isfinite(scale));
     if (!inDocument() || !isOutermostSVGSVGElement())
         return;
 
-    LocalFrame* frame = document().frame();
-    if (!frame)
-        return;
-
-    const FrameTree& frameTree = frame->tree();
-
-    // The behaviour of setCurrentScale() is undefined, when we're dealing with non-standalone SVG documents.
-    // We choose the ignore this call, it's pretty useless to support calling setCurrentScale() from within
-    // an embedded SVG document, for the same reasons as in currentScale() - needs resolution by SVG WG.
-    if (frameTree.parent())
-        return;
-
-    frame->setPageZoomFactor(scale);
+    m_currentScale = scale;
+    updateUserTransform();
 }
 
 class SVGCurrentTranslateTearOff : public SVGPointTearOff {
 public:
     static PassRefPtrWillBeRawPtr<SVGCurrentTranslateTearOff> create(SVGSVGElement* contextElement)
     {
         return adoptRefWillBeNoop(new SVGCurrentTranslateTearOff(contextElement));
     }
 
     void commitChange() override
     {
         ASSERT(contextElement());
-        toSVGSVGElement(contextElement())->updateCurrentTranslate();
+        toSVGSVGElement(contextElement())->updateUserTransform();
     }
 
 private:
     SVGCurrentTranslateTearOff(SVGSVGElement* contextElement)
         : SVGPointTearOff(contextElement->m_translation, contextElement, PropertyIsNotAnimVal)
     {
     }
 };
 
 PassRefPtrWillBeRawPtr<SVGPointTearOff> SVGSVGElement::currentTranslateFromJavascript()
 {
     return SVGCurrentTranslateTearOff::create(this);
 }
 
 void SVGSVGElement::setCurrentTranslate(const FloatPoint& point)
 {
     m_translation->setValue(point);
-    updateCurrentTranslate();
+    updateUserTransform();
 }
 
-void SVGSVGElement::updateCurrentTranslate()
+void SVGSVGElement::updateUserTransform()
 {
     if (LayoutObject* object = layoutObject())
         object->setNeedsLayoutAndFullPaintInvalidation(LayoutInvalidationReason::Unknown);
 }
 
 bool SVGSVGElement::zoomAndPanEnabled() const
 {
     const SVGZoomAndPan* currentViewSpec = this;
     if (m_useCurrentView)
         currentViewSpec = m_viewSpec.get();
@@ skipping 566 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