Drop [LegacyImplementedInBaseClass] from SVGFitToViewBox IDL interface

Drop [LegacyImplementedInBaseClass] from SVGFitToViewBox IDL interface

Drop [LegacyImplementedInBaseClass] from SVGFitToViewBox IDL interface by
refactoring the code. More code was also moved to SVGFitToViewBox class to
avoid code duplication.

R=haraken, pdr
BUG=344224
Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=167269

[pdr., 2014-02-16 22:34:11]

On 2014/02/16 22:00:00, Chris Dumez wrote:

LGTM

[haraken, 2014-02-16 23:23:35]

LGTM

https://codereview.chromium.org/169033002/diff/20016/Source/core/svg/SVGMarke...
File Source/core/svg/SVGMarkerElement.cpp (right):

https://codereview.chromium.org/169033002/diff/20016/Source/core/svg/SVGMarke...
Source/core/svg/SVGMarkerElement.cpp:144: } else if
(SVGFitToViewBox::parseAttribute(name, value, document(), parseError)) {

kouhei: This might make it a bit more complicated to auto-generate this error
parsing code :)

[haraken, 2014-02-16 23:24:16]

Thanks for removing [LegacyImplementedInBaseClass] before switching to the new
IDL compiler! (The switch will happen next week hopefully.)

[Inactive, 2014-02-16 23:34:40]

The CQ bit was checked by ch.dumez@samsung.com

[commit-bot: I haz the power, 2014-02-16 23:34:49]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/ch.dumez@samsung.com/169033002/20016

[Inactive, 2014-02-17 01:30:03]

The CQ bit was unchecked by ch.dumez@samsung.com

[Inactive, 2014-02-17 01:30:07]

The CQ bit was checked by ch.dumez@samsung.com

[Inactive, 2014-02-17 02:45:03]

The CQ bit was unchecked by ch.dumez@samsung.com

[Inactive, 2014-02-17 02:46:49]

The CQ bit was checked by ch.dumez@samsung.com

[commit-bot: I haz the power, 2014-02-17 02:46:53]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/ch.dumez@samsung.com/169033002/200001

[commit-bot: I haz the power, 2014-02-17 04:55:31]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-02-17 04:55:32]

Failed to apply patch for Source/core/svg/SVGSVGElement.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/core/svg/SVGSVGElement.cpp
  Hunk #1 succeeded at 70 with fuzz 2.
  Hunk #2 succeeded at 88 (offset -1 lines).
  Hunk #3 FAILED at 281.
  Hunk #4 succeeded at 555 (offset -1 lines).
  Hunk #5 succeeded at 671 (offset -1 lines).
  Hunk #6 succeeded at 745 (offset -1 lines).
  1 out of 6 hunks FAILED -- saving rejects to file
Source/core/svg/SVGSVGElement.cpp.rej

Patch:       Source/core/svg/SVGSVGElement.cpp
Index: Source/core/svg/SVGSVGElement.cpp
diff --git a/Source/core/svg/SVGSVGElement.cpp
b/Source/core/svg/SVGSVGElement.cpp
index
215e5953b0726821c363abbe3fee0ab95628cf81..4afb745a1ec4d4ba3dce2ecd5e7d6762e26ebf01
100644
--- a/Source/core/svg/SVGSVGElement.cpp
+++ b/Source/core/svg/SVGSVGElement.cpp
@@ -70,12 +70,11 @@ END_REGISTER_ANIMATED_PROPERTIES
 
 inline SVGSVGElement::SVGSVGElement(Document& doc)
     : SVGGraphicsElement(SVGNames::svgTag, doc)
+    , SVGFitToViewBox(this)
     , m_x(SVGAnimatedLength::create(this, SVGNames::xAttr,
SVGLength::create(LengthModeWidth)))
     , m_y(SVGAnimatedLength::create(this, SVGNames::yAttr,
SVGLength::create(LengthModeHeight)))
     , m_width(SVGAnimatedLength::create(this, SVGNames::widthAttr,
SVGLength::create(LengthModeWidth)))
     , m_height(SVGAnimatedLength::create(this, SVGNames::heightAttr,
SVGLength::create(LengthModeHeight)))
-    , m_viewBox(SVGAnimatedRect::create(this, SVGNames::viewBoxAttr))
-    , m_preserveAspectRatio(SVGAnimatedPreserveAspectRatio::create(this,
SVGNames::preserveAspectRatioAttr, SVGPreserveAspectRatio::create()))
     , m_useCurrentView(false)
     , m_zoomAndPan(SVGZoomAndPanMagnify)
     , m_timeContainer(SMILTimeContainer::create(this))
@@ -90,8 +89,6 @@ inline SVGSVGElement::SVGSVGElement(Document& doc)
     addToPropertyMap(m_y);
     addToPropertyMap(m_width);
     addToPropertyMap(m_height);
-    addToPropertyMap(m_viewBox);
-    addToPropertyMap(m_preserveAspectRatio);
     registerAnimatedPropertiesForSVGSVGElement();
 
     UseCounter::count(doc, UseCounter::SVGSVGElement);
@@ -284,7 +281,7 @@ void SVGSVGElement::parseAttribute(const QualifiedName&
name, const AtomicString
         m_width->setBaseValueAsString(value, ForbidNegativeLengths,
parseError);
     else if (name == SVGNames::heightAttr)
         m_height->setBaseValueAsString(value, ForbidNegativeLengths,
parseError);
-    else if (SVGFitToViewBox::parseAttribute(this, name, value)
+    else if (SVGFitToViewBox::parseAttribute(name, value, document(),
parseError)
             || SVGZoomAndPan::parseAttribute(this, name, value)) {
     } else
         SVGGraphicsElement::parseAttribute(name, value);
@@ -559,7 +556,7 @@ FloatRect SVGSVGElement::currentViewBoxRect() const
     if (m_useCurrentView)
         return m_viewSpec ? m_viewSpec->viewBox()->currentValue()->value() :
FloatRect();
 
-    FloatRect useViewBox = m_viewBox->currentValue()->value();
+    FloatRect useViewBox = viewBox()->currentValue()->value();
     if (!useViewBox.isEmpty())
         return useViewBox;
     if (!renderer() || !renderer()->isSVGRoot())
@@ -675,7 +672,7 @@ Length SVGSVGElement::intrinsicHeight(ConsiderCSSMode mode)
const
 AffineTransform SVGSVGElement::viewBoxToViewTransform(float viewWidth, float
viewHeight) const
 {
     if (!m_useCurrentView || !m_viewSpec)
-        return SVGFitToViewBox::viewBoxToViewTransform(currentViewBoxRect(),
m_preserveAspectRatio->currentValue(), viewWidth, viewHeight);
+        return SVGFitToViewBox::viewBoxToViewTransform(currentViewBoxRect(),
preserveAspectRatio()->currentValue(), viewWidth, viewHeight);
 
     AffineTransform ctm =
SVGFitToViewBox::viewBoxToViewTransform(currentViewBoxRect(),
m_viewSpec->preserveAspectRatio()->currentValue(), viewWidth, viewHeight);
     const SVGTransformList& transformList = m_viewSpec->transformBaseValue();
@@ -749,14 +746,14 @@ void SVGSVGElement::inheritViewAttributes(SVGViewElement*
viewElement)
     if (viewElement->hasAttribute(SVGNames::viewBoxAttr))
        
view->viewBox()->baseValue()->setValue(viewElement->viewBox()->currentValue()->value());
     else
-       
view->viewBox()->baseValue()->setValue(m_viewBox->currentValue()->value());
+       
view->viewBox()->baseValue()->setValue(viewBox()->currentValue()->value());
 
     if (viewElement->hasAttribute(SVGNames::preserveAspectRatioAttr)) {
        
view->preserveAspectRatio()->baseValue()->setAlign(viewElement->preserveAspectRatio()->currentValue()->align());
        
view->preserveAspectRatio()->baseValue()->setMeetOrSlice(viewElement->preserveAspectRatio()->currentValue()->meetOrSlice());
     } else {
-       
view->preserveAspectRatio()->baseValue()->setAlign(m_preserveAspectRatio->currentValue()->align());
-       
view->preserveAspectRatio()->baseValue()->setMeetOrSlice(m_preserveAspectRatio->currentValue()->meetOrSlice());
+       
view->preserveAspectRatio()->baseValue()->setAlign(preserveAspectRatio()->currentValue()->align());
+       
view->preserveAspectRatio()->baseValue()->setMeetOrSlice(preserveAspectRatio()->currentValue()->meetOrSlice());
     }
 
     if (viewElement->hasAttribute(SVGNames::zoomAndPanAttr))

[Inactive, 2014-02-17 05:05:47]

The CQ bit was checked by ch.dumez@samsung.com

[commit-bot: I haz the power, 2014-02-17 05:06:04]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/ch.dumez@samsung.com/169033002/300001

[commit-bot: I haz the power, 2014-02-17 06:49:06]

Change committed as 167269