| 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 520 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 531         if (m_derefElementTimer.isActive()) | 531         if (m_derefElementTimer.isActive()) | 
| 532             m_derefElementTimer.stop(); | 532             m_derefElementTimer.stop(); | 
| 533         else | 533         else | 
| 534             m_keepAlive = m_element; | 534             m_keepAlive = m_element; | 
| 535     } else { | 535     } else { | 
| 536         ASSERT(!m_derefElementTimer.isActive()); | 536         ASSERT(!m_derefElementTimer.isActive()); | 
| 537         m_derefElementTimer.startOneShot(0, BLINK_FROM_HERE); | 537         m_derefElementTimer.startOneShot(0, BLINK_FROM_HERE); | 
| 538     } | 538     } | 
| 539 } | 539 } | 
| 540 | 540 | 
| 541 void ImageLoader::timerFired(Timer<ImageLoader>*) | 541 void ImageLoader::timerFired(TimerBase*) | 
| 542 { | 542 { | 
| 543     m_keepAlive.clear(); | 543     m_keepAlive.clear(); | 
| 544 } | 544 } | 
| 545 | 545 | 
| 546 void ImageLoader::dispatchPendingEvent(ImageEventSender* eventSender) | 546 void ImageLoader::dispatchPendingEvent(ImageEventSender* eventSender) | 
| 547 { | 547 { | 
| 548     WTF_LOG(ResourceLoading, "ImageLoader::dispatchPendingEvent %p", this); | 548     WTF_LOG(ResourceLoading, "ImageLoader::dispatchPendingEvent %p", this); | 
| 549     ASSERT(eventSender == &loadEventSender() || eventSender == &errorEventSender
     ()); | 549     ASSERT(eventSender == &loadEventSender() || eventSender == &errorEventSender
     ()); | 
| 550     const AtomicString& eventType = eventSender->eventType(); | 550     const AtomicString& eventType = eventSender->eventType(); | 
| 551     if (eventType == EventTypeNames::load) | 551     if (eventType == EventTypeNames::load) | 
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 604 | 604 | 
| 605 void ImageLoader::elementDidMoveToNewDocument() | 605 void ImageLoader::elementDidMoveToNewDocument() | 
| 606 { | 606 { | 
| 607     if (m_loadDelayCounter) | 607     if (m_loadDelayCounter) | 
| 608         m_loadDelayCounter->documentChanged(m_element->document()); | 608         m_loadDelayCounter->documentChanged(m_element->document()); | 
| 609     clearFailedLoadURL(); | 609     clearFailedLoadURL(); | 
| 610     setImage(0); | 610     setImage(0); | 
| 611 } | 611 } | 
| 612 | 612 | 
| 613 } // namespace blink | 613 } // namespace blink | 
| OLD | NEW | 
|---|