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

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: Only perform weak processing of the event handler registry if the document is active. Created 6 years, 7 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();
55 #else
56 if (m_cachedImage) {
57 m_cachedImage->removeClient(this);
58 m_cachedImage = 0;
59 }
60 #endif
haraken 2014/04/25 14:30:32 #if ENABLE(OILPAN) ... #else ... #endif
Mads Ager (chromium) 2014/04/28 09:45:21 Done.
54 } 61 }
55 62
56 bool SVGFEImageElement::currentFrameHasSingleSecurityOrigin() const 63 bool SVGFEImageElement::currentFrameHasSingleSecurityOrigin() const
57 { 64 {
58 if (m_cachedImage && m_cachedImage->image()) 65 if (m_cachedImage && m_cachedImage->image())
59 return m_cachedImage->image()->currentFrameHasSingleSecurityOrigin(); 66 return m_cachedImage->image()->currentFrameHasSingleSecurityOrigin();
60 67
61 return true; 68 return true;
62 } 69 }
63 70
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 } 192 }
186 193
187 PassRefPtr<FilterEffect> SVGFEImageElement::build(SVGFilterBuilder*, Filter* fil ter) 194 PassRefPtr<FilterEffect> SVGFEImageElement::build(SVGFilterBuilder*, Filter* fil ter)
188 { 195 {
189 if (m_cachedImage) 196 if (m_cachedImage)
190 return FEImage::createWithImage(filter, m_cachedImage->imageForRenderer( renderer()), m_preserveAspectRatio->currentValue()); 197 return FEImage::createWithImage(filter, m_cachedImage->imageForRenderer( renderer()), m_preserveAspectRatio->currentValue());
191 return FEImage::createWithIRIReference(filter, treeScope(), hrefString(), m_ preserveAspectRatio->currentValue()); 198 return FEImage::createWithIRIReference(filter, treeScope(), hrefString(), m_ preserveAspectRatio->currentValue());
192 } 199 }
193 200
194 } 201 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698