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

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

Issue 2146403004: ThreadableLoader::cancel should be called before loader destruction (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@onheap-threadable-loader-client-wrapper
Patch Set: fix Created 4 years, 5 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
Index: third_party/WebKit/Source/core/loader/ThreadableLoaderClientWrapper.h
diff --git a/third_party/WebKit/Source/core/loader/ThreadableLoaderClientWrapper.h b/third_party/WebKit/Source/core/loader/ThreadableLoaderClientWrapper.h
index aee4ccbab5ff8b62d9ef279099e6a7d6db5c963a..c78779b5354fa6c62d48692272e3bcf09aff82dd 100644
--- a/third_party/WebKit/Source/core/loader/ThreadableLoaderClientWrapper.h
+++ b/third_party/WebKit/Source/core/loader/ThreadableLoaderClientWrapper.h
@@ -90,29 +90,41 @@ public:
void didFinishLoading(unsigned long identifier, double finishTime)
{
m_done = true;
- if (m_client)
- m_client->didFinishLoading(identifier, finishTime);
+ if (m_client) {
+ ThreadableLoaderClient* client = m_client;
+ m_client = nullptr;
+ client->didFinishLoading(identifier, finishTime);
+ }
}
void didFail(const ResourceError& error)
{
m_done = true;
- if (m_client)
- m_client->didFail(error);
+ if (m_client) {
+ ThreadableLoaderClient* client = m_client;
+ m_client = nullptr;
+ client->didFail(error);
+ }
}
void didFailAccessControlCheck(const ResourceError& error)
{
m_done = true;
- if (m_client)
- m_client->didFailAccessControlCheck(error);
+ if (m_client) {
+ ThreadableLoaderClient* client = m_client;
+ m_client = nullptr;
+ client->didFailAccessControlCheck(error);
+ }
}
void didFailRedirectCheck()
{
m_done = true;
- if (m_client)
- m_client->didFailRedirectCheck();
+ if (m_client) {
+ ThreadableLoaderClient* client = m_client;
+ m_client = nullptr;
+ client->didFailRedirectCheck();
+ }
}
void didDownloadData(int dataLength)

Powered by Google App Engine
This is Rietveld 408576698