Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(16)

Side by Side Diff: Source/core/svg/SVGImageElement.cpp

Issue 1025883002: Oilpan: revert SVG GC mixin constructor workaround. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/svg/SVGGraphicsElement.cpp ('k') | Source/core/svg/SVGMPathElement.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2005, 2006, 2008 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2004, 2005, 2006, 2008 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Rob Buis <buis@kde.org>
4 * Copyright (C) 2006 Alexander Kellett <lypanov@kde.org> 4 * Copyright (C) 2006 Alexander Kellett <lypanov@kde.org>
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 14 matching lines...) Expand all
25 25
26 #include "core/CSSPropertyNames.h" 26 #include "core/CSSPropertyNames.h"
27 #include "core/XLinkNames.h" 27 #include "core/XLinkNames.h"
28 #include "core/layout/LayoutImageResource.h" 28 #include "core/layout/LayoutImageResource.h"
29 #include "core/layout/svg/LayoutSVGImage.h" 29 #include "core/layout/svg/LayoutSVGImage.h"
30 30
31 namespace blink { 31 namespace blink {
32 32
33 inline SVGImageElement::SVGImageElement(Document& document) 33 inline SVGImageElement::SVGImageElement(Document& document)
34 : SVGGraphicsElement(SVGNames::imageTag, document) 34 : SVGGraphicsElement(SVGNames::imageTag, document)
35 , SVGURIReference(this)
35 , m_x(SVGAnimatedLength::create(this, SVGNames::xAttr, SVGLength::create(SVG LengthMode::Width), AllowNegativeLengths)) 36 , m_x(SVGAnimatedLength::create(this, SVGNames::xAttr, SVGLength::create(SVG LengthMode::Width), AllowNegativeLengths))
36 , m_y(SVGAnimatedLength::create(this, SVGNames::yAttr, SVGLength::create(SVG LengthMode::Height), AllowNegativeLengths)) 37 , m_y(SVGAnimatedLength::create(this, SVGNames::yAttr, SVGLength::create(SVG LengthMode::Height), AllowNegativeLengths))
37 , m_width(SVGAnimatedLength::create(this, SVGNames::widthAttr, SVGLength::cr eate(SVGLengthMode::Width), ForbidNegativeLengths)) 38 , m_width(SVGAnimatedLength::create(this, SVGNames::widthAttr, SVGLength::cr eate(SVGLengthMode::Width), ForbidNegativeLengths))
38 , m_height(SVGAnimatedLength::create(this, SVGNames::heightAttr, SVGLength:: create(SVGLengthMode::Height), ForbidNegativeLengths)) 39 , m_height(SVGAnimatedLength::create(this, SVGNames::heightAttr, SVGLength:: create(SVGLengthMode::Height), ForbidNegativeLengths))
39 , m_preserveAspectRatio(SVGAnimatedPreserveAspectRatio::create(this, SVGName s::preserveAspectRatioAttr, SVGPreserveAspectRatio::create())) 40 , m_preserveAspectRatio(SVGAnimatedPreserveAspectRatio::create(this, SVGName s::preserveAspectRatioAttr, SVGPreserveAspectRatio::create()))
40 , m_imageLoader(SVGImageLoader::create(this)) 41 , m_imageLoader(SVGImageLoader::create(this))
41 , m_needsLoaderURIUpdate(true) 42 , m_needsLoaderURIUpdate(true)
42 { 43 {
43 SVGURIReference::initialize(this);
44
45 addToPropertyMap(m_x); 44 addToPropertyMap(m_x);
46 addToPropertyMap(m_y); 45 addToPropertyMap(m_y);
47 addToPropertyMap(m_width); 46 addToPropertyMap(m_width);
48 addToPropertyMap(m_height); 47 addToPropertyMap(m_height);
49 addToPropertyMap(m_preserveAspectRatio); 48 addToPropertyMap(m_preserveAspectRatio);
50 } 49 }
51 50
52 DEFINE_NODE_FACTORY(SVGImageElement) 51 DEFINE_NODE_FACTORY(SVGImageElement)
53 52
54 DEFINE_TRACE(SVGImageElement) 53 DEFINE_TRACE(SVGImageElement)
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 return AtomicString(hrefString()); 221 return AtomicString(hrefString());
223 } 222 }
224 223
225 void SVGImageElement::didMoveToNewDocument(Document& oldDocument) 224 void SVGImageElement::didMoveToNewDocument(Document& oldDocument)
226 { 225 {
227 imageLoader().elementDidMoveToNewDocument(); 226 imageLoader().elementDidMoveToNewDocument();
228 SVGGraphicsElement::didMoveToNewDocument(oldDocument); 227 SVGGraphicsElement::didMoveToNewDocument(oldDocument);
229 } 228 }
230 229
231 } // namespace blink 230 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/svg/SVGGraphicsElement.cpp ('k') | Source/core/svg/SVGMPathElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698