Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1112)

Unified Diff: third_party/WebKit/Source/core/loader/ImageLoader.cpp

Issue 2859383002: Add CHECK()s about ImageLoader::has_pending_load_event_ (Closed)
Patch Set: bug fix Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/loader/ImageLoader.cpp
diff --git a/third_party/WebKit/Source/core/loader/ImageLoader.cpp b/third_party/WebKit/Source/core/loader/ImageLoader.cpp
index 6009426ade2710d17bf7552ab58d6ac0692e1096..efb2bde0845ca1dad5712bc41534ff1f914726d1 100644
--- a/third_party/WebKit/Source/core/loader/ImageLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/ImageLoader.cpp
@@ -496,6 +496,12 @@ void ImageLoader::ImageNotifyFinished(ImageResourceContent* resource) {
DCHECK(failed_load_url_.IsEmpty());
DCHECK_EQ(resource, image_.Get());
+ if (loading_image_document_) {
+ CHECK(image_complete_);
+ } else {
+ CHECK(!image_complete_);
+ }
kinuko 2017/05/08 05:34:34 nit: no braces for one-block line for consistency
hiroshige 2017/05/08 18:56:42 Done.
+
image_complete_ = true;
delay_until_image_notify_finished_ = nullptr;
@@ -509,8 +515,12 @@ void ImageLoader::ImageNotifyFinished(ImageResourceContent* resource) {
ToSVGImage(image_->GetImage())
->UpdateUseCounters(GetElement()->GetDocument());
- if (!has_pending_load_event_)
+ if (loading_image_document_) {
+ CHECK(!has_pending_load_event_);
return;
+ }
+
+ CHECK(has_pending_load_event_);
if (resource->ErrorOccurred()) {
LoadEventSender().CancelEvent(this);
@@ -610,10 +620,10 @@ void ImageLoader::DispatchPendingEvent(ImageEventSender* event_sender) {
}
void ImageLoader::DispatchPendingLoadEvent() {
- if (!has_pending_load_event_)
- return;
+ CHECK(has_pending_load_event_);
if (!image_)
return;
+ CHECK(image_complete_);
has_pending_load_event_ = false;
if (GetElement()->GetDocument().GetFrame())
DispatchLoadEvent();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698