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

Unified Diff: third_party/WebKit/Source/core/fetch/Resource.cpp

Issue 2487763003: [ImageLoader 2d] Set DecodeError by calling ResourceLoader::cancel()
Patch Set: Rebase Created 4 years, 1 month 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
Index: third_party/WebKit/Source/core/fetch/Resource.cpp
diff --git a/third_party/WebKit/Source/core/fetch/Resource.cpp b/third_party/WebKit/Source/core/fetch/Resource.cpp
index 837e76b58a7f633445e2e9225d497e5cb1e074dc..9f0e34c6a1f7f7d8dc5a31d3b9eefaf7d9451f5d 100644
--- a/third_party/WebKit/Source/core/fetch/Resource.cpp
+++ b/third_party/WebKit/Source/core/fetch/Resource.cpp
@@ -401,8 +401,9 @@ void Resource::setDataBufferingPolicy(DataBufferingPolicy dataBufferingPolicy) {
setEncodedSize(0);
}
-void Resource::error(const ResourceError& error) {
+void Resource::error(const ResourceError& error, Status errorStatus) {
DCHECK(!error.isNull());
+ DCHECK(errorStatus == LoadError || errorStatus == DecodeError);
m_error = error;
m_isRevalidating = false;
@@ -410,7 +411,7 @@ void Resource::error(const ResourceError& error) {
memoryCache()->remove(this);
if (!errorOccurred())
- setStatus(LoadError);
+ setStatus(errorStatus);
DCHECK(errorOccurred());
m_data.clear();
m_loader = nullptr;
« no previous file with comments | « third_party/WebKit/Source/core/fetch/Resource.h ('k') | third_party/WebKit/Source/core/fetch/ResourceFetcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698