| OLD | NEW |
| 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 #if ENABLE(OILPAN) | 48 #if ENABLE(OILPAN) |
| 49 if (m_cachedImage) { | 49 if (m_cachedImage) { |
| 50 m_cachedImage->removeClient(this); | 50 m_cachedImage->removeClient(this); |
| 51 m_cachedImage = 0; | 51 m_cachedImage = 0; |
| 52 } | 52 } |
| 53 #else | 53 #else |
| 54 clearResourceReferences(); | 54 clearResourceReferences(); |
| 55 #endif | 55 #endif |
| 56 } | 56 } |
| 57 | 57 |
| 58 void SVGFEImageElement::trace(Visitor* visitor) |
| 59 { |
| 60 visitor->trace(m_preserveAspectRatio); |
| 61 SVGFilterPrimitiveStandardAttributes::trace(visitor); |
| 62 SVGURIReference::trace(visitor); |
| 63 } |
| 64 |
| 58 bool SVGFEImageElement::currentFrameHasSingleSecurityOrigin() const | 65 bool SVGFEImageElement::currentFrameHasSingleSecurityOrigin() const |
| 59 { | 66 { |
| 60 if (m_cachedImage && m_cachedImage->image()) | 67 if (m_cachedImage && m_cachedImage->image()) |
| 61 return m_cachedImage->image()->currentFrameHasSingleSecurityOrigin(); | 68 return m_cachedImage->image()->currentFrameHasSingleSecurityOrigin(); |
| 62 | 69 |
| 63 return true; | 70 return true; |
| 64 } | 71 } |
| 65 | 72 |
| 66 void SVGFEImageElement::clearResourceReferences() | 73 void SVGFEImageElement::clearResourceReferences() |
| 67 { | 74 { |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 165 Element* parent = parentElement(); | 172 Element* parent = parentElement(); |
| 166 ASSERT(parent); | 173 ASSERT(parent); |
| 167 | 174 |
| 168 if (!isSVGFilterElement(*parent) || !parent->renderer()) | 175 if (!isSVGFilterElement(*parent) || !parent->renderer()) |
| 169 return; | 176 return; |
| 170 | 177 |
| 171 if (RenderObject* renderer = this->renderer()) | 178 if (RenderObject* renderer = this->renderer()) |
| 172 markForLayoutAndParentResourceInvalidation(renderer); | 179 markForLayoutAndParentResourceInvalidation(renderer); |
| 173 } | 180 } |
| 174 | 181 |
| 175 PassRefPtr<FilterEffect> SVGFEImageElement::build(SVGFilterBuilder*, Filter* fil
ter) | 182 PassRefPtrWillBeRawPtr<FilterEffect> SVGFEImageElement::build(SVGFilterBuilder*,
Filter* filter) |
| 176 { | 183 { |
| 177 if (m_cachedImage) | 184 if (m_cachedImage) |
| 178 return FEImage::createWithImage(filter, m_cachedImage->imageForRenderer(
renderer()), m_preserveAspectRatio->currentValue()); | 185 return FEImage::createWithImage(filter, m_cachedImage->imageForRenderer(
renderer()), m_preserveAspectRatio->currentValue()); |
| 179 return FEImage::createWithIRIReference(filter, treeScope(), hrefString(), m_
preserveAspectRatio->currentValue()); | 186 return FEImage::createWithIRIReference(filter, treeScope(), hrefString(), m_
preserveAspectRatio->currentValue()); |
| 180 } | 187 } |
| 181 | 188 |
| 182 } | 189 } |
| OLD | NEW |