| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 4 * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010 Apple Inc. All rights reserv
ed. | 4 * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010 Apple Inc. All rights reserv
ed. |
| 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 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 loadEventSender().cancelEvent(this); | 136 loadEventSender().cancelEvent(this); |
| 137 | 137 |
| 138 ASSERT(m_hasPendingErrorEvent || !errorEventSender().hasPendingEvents(this))
; | 138 ASSERT(m_hasPendingErrorEvent || !errorEventSender().hasPendingEvents(this))
; |
| 139 if (m_hasPendingErrorEvent) | 139 if (m_hasPendingErrorEvent) |
| 140 errorEventSender().cancelEvent(this); | 140 errorEventSender().cancelEvent(this); |
| 141 } | 141 } |
| 142 | 142 |
| 143 void ImageLoader::trace(Visitor* visitor) | 143 void ImageLoader::trace(Visitor* visitor) |
| 144 { | 144 { |
| 145 visitor->trace(m_element); | 145 visitor->trace(m_element); |
| 146 ImageResourceClient::trace(visitor); |
| 146 } | 147 } |
| 147 | 148 |
| 148 void ImageLoader::setImage(ImageResource* newImage) | 149 void ImageLoader::setImage(ImageResource* newImage) |
| 149 { | 150 { |
| 150 setImageWithoutConsideringPendingLoadEvent(newImage); | 151 setImageWithoutConsideringPendingLoadEvent(newImage); |
| 151 | 152 |
| 152 // Only consider updating the protection ref-count of the Element immediatel
y before returning | 153 // Only consider updating the protection ref-count of the Element immediatel
y before returning |
| 153 // from this function as doing so might result in the destruction of this Im
ageLoader. | 154 // from this function as doing so might result in the destruction of this Im
ageLoader. |
| 154 updatedHasPendingEvent(); | 155 updatedHasPendingEvent(); |
| 155 } | 156 } |
| (...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 557 } | 558 } |
| 558 | 559 |
| 559 #if ENABLE(OILPAN) | 560 #if ENABLE(OILPAN) |
| 560 ImageLoader::ImageLoaderClientRemover::~ImageLoaderClientRemover() | 561 ImageLoader::ImageLoaderClientRemover::~ImageLoaderClientRemover() |
| 561 { | 562 { |
| 562 m_loader.willRemoveClient(m_client); | 563 m_loader.willRemoveClient(m_client); |
| 563 } | 564 } |
| 564 #endif | 565 #endif |
| 565 | 566 |
| 566 } | 567 } |
| OLD | NEW |