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

Unified Diff: Source/core/loader/cache/CachedResource.cpp

Issue 42523003: [oilpan] Don't notify CachedResourceClients of cancel events when detaching the frame. (Closed) Base URL: svn://svn.chromium.org/blink/branches/oilpan
Patch Set: Created 7 years, 2 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 | « Source/core/loader/FrameLoader.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/loader/cache/CachedResource.cpp
diff --git a/Source/core/loader/cache/CachedResource.cpp b/Source/core/loader/cache/CachedResource.cpp
index 7b7df611652ba66a90322af6cc90eb72c6a60db3..b7d60fdd952d06994887120614e1937826497f87 100644
--- a/Source/core/loader/cache/CachedResource.cpp
+++ b/Source/core/loader/cache/CachedResource.cpp
@@ -475,8 +475,12 @@ CachedMetadata* CachedResource::cachedMetadata(unsigned dataTypeID) const
void CachedResource::stopLoading()
{
- ASSERT(m_loader);
+ ASSERT(m_loader);
+ bool isFrameDetaching = m_loader->frameLoader()->isFrameDetaching();
m_loader = 0;
+ // Don't notify clients if the frame is being torn down.
+ if (isFrameDetaching)
+ return;
CachedResourceHandle<CachedResource> protect(this);
« no previous file with comments | « Source/core/loader/FrameLoader.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698