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 | 4 * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010 Apple Inc. All rights |
5 * reserved. | 5 * reserved. |
6 * | 6 * |
7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
(...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
484 // Update ImageAnimationPolicy for m_image. | 484 // Update ImageAnimationPolicy for m_image. |
485 if (image_) | 485 if (image_) |
486 image_->UpdateImageAnimationPolicy(); | 486 image_->UpdateImageAnimationPolicy(); |
487 | 487 |
488 UpdateLayoutObject(); | 488 UpdateLayoutObject(); |
489 | 489 |
490 if (image_ && image_->GetImage() && image_->GetImage()->IsSVGImage()) | 490 if (image_ && image_->GetImage() && image_->GetImage()->IsSVGImage()) |
491 ToSVGImage(image_->GetImage()) | 491 ToSVGImage(image_->GetImage()) |
492 ->UpdateUseCounters(GetElement()->GetDocument()); | 492 ->UpdateUseCounters(GetElement()->GetDocument()); |
493 | 493 |
| 494 if (isHTMLImageElement(GetElement())) { |
| 495 toHTMLImageElement(GetElement()) |
| 496 ->ImageNotifyFinished(!resource->ErrorOccurred()); |
| 497 } |
| 498 |
494 if (!has_pending_load_event_) | 499 if (!has_pending_load_event_) |
495 return; | 500 return; |
496 | 501 |
497 if (resource->ErrorOccurred()) { | 502 if (resource->ErrorOccurred()) { |
498 LoadEventSender().CancelEvent(this); | 503 LoadEventSender().CancelEvent(this); |
499 has_pending_load_event_ = false; | 504 has_pending_load_event_ = false; |
500 | 505 |
501 if (resource->GetResourceError().IsAccessCheck()) { | 506 if (resource->GetResourceError().IsAccessCheck()) { |
502 CrossSiteOrCSPViolationOccurred( | 507 CrossSiteOrCSPViolationOccurred( |
503 AtomicString(resource->GetResourceError().FailingURL())); | 508 AtomicString(resource->GetResourceError().FailingURL())); |
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
637 } | 642 } |
638 | 643 |
639 void ImageLoader::ElementDidMoveToNewDocument() { | 644 void ImageLoader::ElementDidMoveToNewDocument() { |
640 if (load_delay_counter_) | 645 if (load_delay_counter_) |
641 load_delay_counter_->DocumentChanged(element_->GetDocument()); | 646 load_delay_counter_->DocumentChanged(element_->GetDocument()); |
642 ClearFailedLoadURL(); | 647 ClearFailedLoadURL(); |
643 SetImage(0); | 648 SetImage(0); |
644 } | 649 } |
645 | 650 |
646 } // namespace blink | 651 } // namespace blink |
OLD | NEW |