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

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

Issue 235113002: Oilpan: Remove guardRef and guardDeref from TreeScope. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Address comments. Created 6 years, 8 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
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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 addToPropertyMap(m_preserveAspectRatio); 43 addToPropertyMap(m_preserveAspectRatio);
44 } 44 }
45 45
46 PassRefPtr<SVGFEImageElement> SVGFEImageElement::create(Document& document) 46 PassRefPtr<SVGFEImageElement> SVGFEImageElement::create(Document& document)
47 { 47 {
48 return adoptRef(new SVGFEImageElement(document)); 48 return adoptRef(new SVGFEImageElement(document));
49 } 49 }
50 50
51 SVGFEImageElement::~SVGFEImageElement() 51 SVGFEImageElement::~SVGFEImageElement()
52 { 52 {
53 #if !ENABLE(OILPAN)
53 clearResourceReferences(); 54 clearResourceReferences();
haraken 2014/04/25 05:21:42 I'm not quite sure if we can completely skip clear
Mads Ager (chromium) 2014/04/25 10:58:25 Yeah, I missed the fact that there was other code
55 #endif
54 } 56 }
55 57
56 bool SVGFEImageElement::currentFrameHasSingleSecurityOrigin() const 58 bool SVGFEImageElement::currentFrameHasSingleSecurityOrigin() const
57 { 59 {
58 if (m_cachedImage && m_cachedImage->image()) 60 if (m_cachedImage && m_cachedImage->image())
59 return m_cachedImage->image()->currentFrameHasSingleSecurityOrigin(); 61 return m_cachedImage->image()->currentFrameHasSingleSecurityOrigin();
60 62
61 return true; 63 return true;
62 } 64 }
63 65
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 } 187 }
186 188
187 PassRefPtr<FilterEffect> SVGFEImageElement::build(SVGFilterBuilder*, Filter* fil ter) 189 PassRefPtr<FilterEffect> SVGFEImageElement::build(SVGFilterBuilder*, Filter* fil ter)
188 { 190 {
189 if (m_cachedImage) 191 if (m_cachedImage)
190 return FEImage::createWithImage(filter, m_cachedImage->imageForRenderer( renderer()), m_preserveAspectRatio->currentValue()); 192 return FEImage::createWithImage(filter, m_cachedImage->imageForRenderer( renderer()), m_preserveAspectRatio->currentValue());
191 return FEImage::createWithIRIReference(filter, treeScope(), hrefString(), m_ preserveAspectRatio->currentValue()); 193 return FEImage::createWithIRIReference(filter, treeScope(), hrefString(), m_ preserveAspectRatio->currentValue());
192 } 194 }
193 195
194 } 196 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698