| 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 { | 58 { |
| 59 ASSERT(m_renderer); | 59 ASSERT(m_renderer); |
| 60 m_styleImage->removeClient(m_renderer); | 60 m_styleImage->removeClient(m_renderer); |
| 61 m_cachedImage = 0; | 61 m_cachedImage = 0; |
| 62 } | 62 } |
| 63 | 63 |
| 64 PassRefPtr<Image> RenderImageResourceStyleImage::image(int width, int height) co
nst | 64 PassRefPtr<Image> RenderImageResourceStyleImage::image(int width, int height) co
nst |
| 65 { | 65 { |
| 66 // Generated content may trigger calls to image() while we're still pending,
don't assert but gracefully exit. | 66 // Generated content may trigger calls to image() while we're still pending,
don't assert but gracefully exit. |
| 67 if (m_styleImage->isPendingImage()) | 67 if (m_styleImage->isPendingImage()) |
| 68 return 0; | 68 return nullptr; |
| 69 return m_styleImage->image(m_renderer, IntSize(width, height)); | 69 return m_styleImage->image(m_renderer, IntSize(width, height)); |
| 70 } | 70 } |
| 71 | 71 |
| 72 void RenderImageResourceStyleImage::setContainerSizeForRenderer(const IntSize& s
ize) | 72 void RenderImageResourceStyleImage::setContainerSizeForRenderer(const IntSize& s
ize) |
| 73 { | 73 { |
| 74 ASSERT(m_renderer); | 74 ASSERT(m_renderer); |
| 75 m_styleImage->setContainerSizeForRenderer(m_renderer, size, m_renderer->styl
e()->effectiveZoom()); | 75 m_styleImage->setContainerSizeForRenderer(m_renderer, size, m_renderer->styl
e()->effectiveZoom()); |
| 76 } | 76 } |
| 77 | 77 |
| 78 } // namespace WebCore | 78 } // namespace WebCore |
| OLD | NEW |