| 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 DEFINE_TRACE(SVGFEImageElement) | 56 DEFINE_TRACE(SVGFEImageElement) |
| 57 { | 57 { |
| 58 visitor->trace(m_preserveAspectRatio); | 58 visitor->trace(m_preserveAspectRatio); |
| 59 visitor->trace(m_cachedImage); | 59 visitor->trace(m_cachedImage); |
| 60 SVGFilterPrimitiveStandardAttributes::trace(visitor); | 60 SVGFilterPrimitiveStandardAttributes::trace(visitor); |
| 61 SVGURIReference::trace(visitor); | 61 SVGURIReference::trace(visitor); |
| 62 } | 62 } |
| 63 | 63 |
| 64 bool SVGFEImageElement::currentFrameHasSingleSecurityOrigin() const | 64 bool SVGFEImageElement::currentFrameHasSingleSecurityOrigin() const |
| 65 { | 65 { |
| 66 if (m_cachedImage && m_cachedImage->image()) | 66 if (m_cachedImage && m_cachedImage->getImage()) |
| 67 return m_cachedImage->image()->currentFrameHasSingleSecurityOrigin(); | 67 return m_cachedImage->getImage()->currentFrameHasSingleSecurityOrigin(); |
| 68 | 68 |
| 69 return true; | 69 return true; |
| 70 } | 70 } |
| 71 | 71 |
| 72 void SVGFEImageElement::clearResourceReferences() | 72 void SVGFEImageElement::clearResourceReferences() |
| 73 { | 73 { |
| 74 if (m_cachedImage) { | 74 if (m_cachedImage) { |
| 75 m_cachedImage->removeClient(this); | 75 m_cachedImage->removeClient(this); |
| 76 m_cachedImage = nullptr; | 76 m_cachedImage = nullptr; |
| 77 } | 77 } |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 | 154 |
| 155 if (LayoutObject* layoutObject = this->layoutObject()) | 155 if (LayoutObject* layoutObject = this->layoutObject()) |
| 156 markForLayoutAndParentResourceInvalidation(layoutObject); | 156 markForLayoutAndParentResourceInvalidation(layoutObject); |
| 157 } | 157 } |
| 158 | 158 |
| 159 PassRefPtrWillBeRawPtr<FilterEffect> SVGFEImageElement::build(SVGFilterBuilder*,
Filter* filter) | 159 PassRefPtrWillBeRawPtr<FilterEffect> SVGFEImageElement::build(SVGFilterBuilder*,
Filter* filter) |
| 160 { | 160 { |
| 161 if (m_cachedImage) { | 161 if (m_cachedImage) { |
| 162 // Don't use the broken image icon on image loading errors. | 162 // Don't use the broken image icon on image loading errors. |
| 163 RefPtr<Image> image = m_cachedImage->errorOccurred() ? | 163 RefPtr<Image> image = m_cachedImage->errorOccurred() ? |
| 164 nullptr : m_cachedImage->image(); | 164 nullptr : m_cachedImage->getImage(); |
| 165 return FEImage::createWithImage(filter, image, m_preserveAspectRatio->cu
rrentValue()); | 165 return FEImage::createWithImage(filter, image, m_preserveAspectRatio->cu
rrentValue()); |
| 166 } | 166 } |
| 167 | 167 |
| 168 return FEImage::createWithIRIReference(filter, treeScope(), hrefString(), m_
preserveAspectRatio->currentValue()); | 168 return FEImage::createWithIRIReference(filter, treeScope(), hrefString(), m_
preserveAspectRatio->currentValue()); |
| 169 } | 169 } |
| 170 | 170 |
| 171 } // namespace blink | 171 } // namespace blink |
| OLD | NEW |