| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll <knoll@kde.org> | 2 * Copyright (C) 1999 Lars Knoll <knoll@kde.org> |
| 3 * Copyright (C) 1999 Antti Koivisto <koivisto@kde.org> | 3 * Copyright (C) 1999 Antti Koivisto <koivisto@kde.org> |
| 4 * Copyright (C) 2000 Dirk Mueller <mueller@kde.org> | 4 * Copyright (C) 2000 Dirk Mueller <mueller@kde.org> |
| 5 * Copyright (C) 2006 Allan Sandfeld Jensen <kde@carewolf.com> | 5 * Copyright (C) 2006 Allan Sandfeld Jensen <kde@carewolf.com> |
| 6 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com> | 6 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com> |
| 7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. | 7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. |
| 8 * All rights reserved. | 8 * All rights reserved. |
| 9 * Copyright (C) 2010 Google Inc. All rights reserved. | 9 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 10 * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com> | 10 * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com> |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 } | 46 } |
| 47 | 47 |
| 48 void LayoutImageResource::shutdown() { | 48 void LayoutImageResource::shutdown() { |
| 49 ASSERT(m_layoutObject); | 49 ASSERT(m_layoutObject); |
| 50 | 50 |
| 51 if (!m_cachedImage) | 51 if (!m_cachedImage) |
| 52 return; | 52 return; |
| 53 m_cachedImage->removeObserver(m_layoutObject); | 53 m_cachedImage->removeObserver(m_layoutObject); |
| 54 } | 54 } |
| 55 | 55 |
| 56 void LayoutImageResource::setImageResource(ImageResource* newImage) { | 56 void LayoutImageResource::setImageResource(ImageResourceContent* newImage) { |
| 57 ASSERT(m_layoutObject); | 57 ASSERT(m_layoutObject); |
| 58 | 58 |
| 59 if (m_cachedImage == newImage) | 59 if (m_cachedImage == newImage) |
| 60 return; | 60 return; |
| 61 | 61 |
| 62 if (m_cachedImage) { | 62 if (m_cachedImage) { |
| 63 m_cachedImage->removeObserver(m_layoutObject); | 63 m_cachedImage->removeObserver(m_layoutObject); |
| 64 } | 64 } |
| 65 m_cachedImage = newImage; | 65 m_cachedImage = newImage; |
| 66 if (m_cachedImage) { | 66 if (m_cachedImage) { |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 } | 111 } |
| 112 return SVGImageForContainer::create(svgImage, containerSize, zoom, url); | 112 return SVGImageForContainer::create(svgImage, containerSize, zoom, url); |
| 113 } | 113 } |
| 114 | 114 |
| 115 bool LayoutImageResource::maybeAnimated() const { | 115 bool LayoutImageResource::maybeAnimated() const { |
| 116 Image* image = m_cachedImage ? m_cachedImage->getImage() : Image::nullImage(); | 116 Image* image = m_cachedImage ? m_cachedImage->getImage() : Image::nullImage(); |
| 117 return image->maybeAnimated(); | 117 return image->maybeAnimated(); |
| 118 } | 118 } |
| 119 | 119 |
| 120 } // namespace blink | 120 } // namespace blink |
| OLD | NEW |