diff options
| author | John Reck <jreck@google.com> | 2010-11-04 12:00:17 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2010-11-09 11:35:04 -0800 |
| commit | e14391e94c850b8bd03680c23b38978db68687a8 (patch) | |
| tree | 3fed87e6620fecaf3edc7259ae58a11662bedcb2 /WebCore/svg/SVGSVGElement.cpp | |
| parent | 1bd705833a68f07850cf7e204b26f8d328d16951 (diff) | |
| download | external_webkit-e14391e94c850b8bd03680c23b38978db68687a8.zip external_webkit-e14391e94c850b8bd03680c23b38978db68687a8.tar.gz external_webkit-e14391e94c850b8bd03680c23b38978db68687a8.tar.bz2 | |
Merge Webkit at r70949: Initial merge by git.
Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
Diffstat (limited to 'WebCore/svg/SVGSVGElement.cpp')
| -rw-r--r-- | WebCore/svg/SVGSVGElement.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/svg/SVGSVGElement.cpp b/WebCore/svg/SVGSVGElement.cpp index 7de880c..2354b27 100644 --- a/WebCore/svg/SVGSVGElement.cpp +++ b/WebCore/svg/SVGSVGElement.cpp @@ -186,7 +186,7 @@ void SVGSVGElement::setUseCurrentView(bool currentView) SVGViewSpec* SVGSVGElement::currentView() const { if (!m_viewSpec) - m_viewSpec = adoptPtr(new SVGViewSpec(this)); + m_viewSpec = adoptPtr(new SVGViewSpec(const_cast<SVGSVGElement*>(this))); return m_viewSpec.get(); } @@ -580,9 +580,9 @@ void SVGSVGElement::inheritViewAttributes(SVGViewElement* viewElement) { setUseCurrentView(true); if (viewElement->hasAttribute(SVGNames::viewBoxAttr)) - currentView()->setViewBox(viewElement->viewBox()); + currentView()->setViewBoxBaseValue(viewElement->viewBox()); else - currentView()->setViewBox(viewBox()); + currentView()->setViewBoxBaseValue(viewBox()); SVGPreserveAspectRatio aspectRatio; if (viewElement->hasAttribute(SVGNames::preserveAspectRatioAttr)) |