Chromium Code Reviews| 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 472 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 483 // Update ImageAnimationPolicy for image_. | 483 // Update ImageAnimationPolicy for image_. |
| 484 if (image_) | 484 if (image_) |
| 485 image_->UpdateImageAnimationPolicy(); | 485 image_->UpdateImageAnimationPolicy(); |
| 486 | 486 |
| 487 UpdateLayoutObject(); | 487 UpdateLayoutObject(); |
| 488 | 488 |
| 489 if (image_ && image_->GetImage() && image_->GetImage()->IsSVGImage()) | 489 if (image_ && image_->GetImage() && image_->GetImage()->IsSVGImage()) |
| 490 ToSVGImage(image_->GetImage()) | 490 ToSVGImage(image_->GetImage()) |
| 491 ->UpdateUseCounters(GetElement()->GetDocument()); | 491 ->UpdateUseCounters(GetElement()->GetDocument()); |
| 492 | 492 |
| 493 if (isHTMLImageElement(GetElement())) { | |
|
pdr.
2017/05/18 03:20:10
Nit: put this in HTMLImageLoader::ImageNotifyFinis
vmpstr
2017/05/18 18:51:13
Done.
| |
| 494 toHTMLImageElement(GetElement()) | |
| 495 ->ImageNotifyFinished(!resource->ErrorOccurred()); | |
| 496 } | |
| 497 | |
| 493 if (!has_pending_load_event_) | 498 if (!has_pending_load_event_) |
| 494 return; | 499 return; |
| 495 | 500 |
| 496 if (resource->ErrorOccurred()) { | 501 if (resource->ErrorOccurred()) { |
| 497 LoadEventSender().CancelEvent(this); | 502 LoadEventSender().CancelEvent(this); |
| 498 has_pending_load_event_ = false; | 503 has_pending_load_event_ = false; |
| 499 | 504 |
| 500 if (resource->GetResourceError().IsAccessCheck()) { | 505 if (resource->GetResourceError().IsAccessCheck()) { |
| 501 CrossSiteOrCSPViolationOccurred( | 506 CrossSiteOrCSPViolationOccurred( |
| 502 AtomicString(resource->GetResourceError().FailingURL())); | 507 AtomicString(resource->GetResourceError().FailingURL())); |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 636 } | 641 } |
| 637 | 642 |
| 638 void ImageLoader::ElementDidMoveToNewDocument() { | 643 void ImageLoader::ElementDidMoveToNewDocument() { |
| 639 if (load_delay_counter_) | 644 if (load_delay_counter_) |
| 640 load_delay_counter_->DocumentChanged(element_->GetDocument()); | 645 load_delay_counter_->DocumentChanged(element_->GetDocument()); |
| 641 ClearFailedLoadURL(); | 646 ClearFailedLoadURL(); |
| 642 SetImage(0); | 647 SetImage(0); |
| 643 } | 648 } |
| 644 | 649 |
| 645 } // namespace blink | 650 } // namespace blink |
| OLD | NEW |