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. All rights
reserved. | 7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights
reserved. |
8 * Copyright (C) 2010 Google Inc. All rights reserved. | 8 * Copyright (C) 2010 Google Inc. All rights reserved. |
9 * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com> | 9 * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com> |
10 * | 10 * |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
66 if (m_cachedImage == newImage) | 66 if (m_cachedImage == newImage) |
67 return; | 67 return; |
68 | 68 |
69 if (m_cachedImage) | 69 if (m_cachedImage) |
70 m_cachedImage->removeClient(m_renderer); | 70 m_cachedImage->removeClient(m_renderer); |
71 m_cachedImage = newImage; | 71 m_cachedImage = newImage; |
72 if (m_cachedImage) { | 72 if (m_cachedImage) { |
73 m_cachedImage->addClient(m_renderer); | 73 m_cachedImage->addClient(m_renderer); |
74 if (m_cachedImage->errorOccurred()) | 74 if (m_cachedImage->errorOccurred()) |
75 m_renderer->imageChanged(m_cachedImage.get()); | 75 m_renderer->imageChanged(m_cachedImage.get()); |
| 76 } else { |
| 77 m_renderer->imageChanged(m_cachedImage.get()); |
76 } | 78 } |
77 } | 79 } |
78 | 80 |
79 void RenderImageResource::resetAnimation() | 81 void RenderImageResource::resetAnimation() |
80 { | 82 { |
81 ASSERT(m_renderer); | 83 ASSERT(m_renderer); |
82 | 84 |
83 if (!m_cachedImage) | 85 if (!m_cachedImage) |
84 return; | 86 return; |
85 | 87 |
86 image()->resetAnimation(); | 88 image()->resetAnimation(); |
87 | 89 |
88 if (!m_renderer->needsLayout()) | 90 if (!m_renderer->needsLayout()) |
89 m_renderer->repaint(); | 91 m_renderer->repaint(); |
90 } | 92 } |
91 | 93 |
92 void RenderImageResource::setContainerSizeForRenderer(const IntSize& imageContai
nerSize) | 94 void RenderImageResource::setContainerSizeForRenderer(const IntSize& imageContai
nerSize) |
93 { | 95 { |
94 ASSERT(m_renderer); | 96 ASSERT(m_renderer); |
95 if (m_cachedImage) | 97 if (m_cachedImage) |
96 m_cachedImage->setContainerSizeForRenderer(m_renderer, imageContainerSiz
e, m_renderer->style()->effectiveZoom()); | 98 m_cachedImage->setContainerSizeForRenderer(m_renderer, imageContainerSiz
e, m_renderer->style()->effectiveZoom()); |
97 } | 99 } |
98 | 100 |
99 Image* RenderImageResource::nullImage() | 101 Image* RenderImageResource::nullImage() |
100 { | 102 { |
101 return Image::nullImage(); | 103 return Image::nullImage(); |
102 } | 104 } |
103 | 105 |
104 } // namespace WebCore | 106 } // namespace WebCore |
OLD | NEW |