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

Side by Side Diff: Source/core/svg/SVGFEImageElement.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/SVGCursorElement.cpp ('k') | Source/core/svg/SVGFilterElement.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, 2007 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org>
4 * Copyright (C) 2010 Dirk Schulze <krit@webkit.org> 4 * Copyright (C) 2010 Dirk Schulze <krit@webkit.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 17 matching lines...) Expand all
28 #include "core/fetch/ResourceFetcher.h" 28 #include "core/fetch/ResourceFetcher.h"
29 #include "core/svg/SVGDocumentExtensions.h" 29 #include "core/svg/SVGDocumentExtensions.h"
30 #include "core/svg/SVGPreserveAspectRatio.h" 30 #include "core/svg/SVGPreserveAspectRatio.h"
31 #include "core/svg/graphics/filters/SVGFEImage.h" 31 #include "core/svg/graphics/filters/SVGFEImage.h"
32 #include "platform/graphics/Image.h" 32 #include "platform/graphics/Image.h"
33 33
34 namespace blink { 34 namespace blink {
35 35
36 inline SVGFEImageElement::SVGFEImageElement(Document& document) 36 inline SVGFEImageElement::SVGFEImageElement(Document& document)
37 : SVGFilterPrimitiveStandardAttributes(SVGNames::feImageTag, document) 37 : SVGFilterPrimitiveStandardAttributes(SVGNames::feImageTag, document)
38 , SVGURIReference(this)
38 , m_preserveAspectRatio(SVGAnimatedPreserveAspectRatio::create(this, SVGName s::preserveAspectRatioAttr, SVGPreserveAspectRatio::create())) 39 , m_preserveAspectRatio(SVGAnimatedPreserveAspectRatio::create(this, SVGName s::preserveAspectRatioAttr, SVGPreserveAspectRatio::create()))
39 { 40 {
40 SVGURIReference::initialize(this);
41
42 addToPropertyMap(m_preserveAspectRatio); 41 addToPropertyMap(m_preserveAspectRatio);
43 } 42 }
44 43
45 DEFINE_NODE_FACTORY(SVGFEImageElement) 44 DEFINE_NODE_FACTORY(SVGFEImageElement)
46 45
47 SVGFEImageElement::~SVGFEImageElement() 46 SVGFEImageElement::~SVGFEImageElement()
48 { 47 {
49 #if ENABLE(OILPAN) 48 #if ENABLE(OILPAN)
50 if (m_cachedImage) { 49 if (m_cachedImage) {
51 m_cachedImage->removeClient(this); 50 m_cachedImage->removeClient(this);
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 } 173 }
175 174
176 PassRefPtrWillBeRawPtr<FilterEffect> SVGFEImageElement::build(SVGFilterBuilder*, Filter* filter) 175 PassRefPtrWillBeRawPtr<FilterEffect> SVGFEImageElement::build(SVGFilterBuilder*, Filter* filter)
177 { 176 {
178 if (m_cachedImage) 177 if (m_cachedImage)
179 return FEImage::createWithImage(filter, m_cachedImage->imageForLayoutObj ect(layoutObject()), m_preserveAspectRatio->currentValue()); 178 return FEImage::createWithImage(filter, m_cachedImage->imageForLayoutObj ect(layoutObject()), m_preserveAspectRatio->currentValue());
180 return FEImage::createWithIRIReference(filter, treeScope(), hrefString(), m_ preserveAspectRatio->currentValue()); 179 return FEImage::createWithIRIReference(filter, treeScope(), hrefString(), m_ preserveAspectRatio->currentValue());
181 } 180 }
182 181
183 } 182 }
OLDNEW
« no previous file with comments | « Source/core/svg/SVGCursorElement.cpp ('k') | Source/core/svg/SVGFilterElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698