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

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

Issue 2859093003: Change the semantics of ImageLoader::has_pending_load_event_ (Closed)
Patch Set: nit 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 | third_party/WebKit/Source/core/loader/ImageLoader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/loader/ImageLoader.h
diff --git a/third_party/WebKit/Source/core/loader/ImageLoader.h b/third_party/WebKit/Source/core/loader/ImageLoader.h
index 534fbb0ec861361acf57d755c2709fd28da64773..250faa8d02e0caf35cc0cd8755f34226ab658d01 100644
--- a/third_party/WebKit/Source/core/loader/ImageLoader.h
+++ b/third_party/WebKit/Source/core/loader/ImageLoader.h
@@ -96,7 +96,8 @@ class CORE_EXPORT ImageLoader : public GarbageCollectedFinalized<ImageLoader>,
void SetLoadingImageDocument() { loading_image_document_ = true; }
bool HasPendingActivity() const {
- return has_pending_load_event_ || has_pending_error_event_ || pending_task_;
+ return (image_ && !image_complete_) || has_pending_load_event_ ||
kouhei (in TOK) 2017/05/08 13:18:40 :) This totally makes sense!
+ has_pending_error_event_ || pending_task_;
}
bool HasPendingError() const { return has_pending_error_event_; }
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/loader/ImageLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698