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

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

Issue 7350001: Merge 90595 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/782/
Patch Set: Created 9 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
« no previous file with comments | « LayoutTests/platform/chromium-linux/fast/dom/HTMLLinkElement/link-and-subresource-test-nonexistent-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/loader/cache/CachedResource.cpp
===================================================================
--- Source/WebCore/loader/cache/CachedResource.cpp (revision 90856)
+++ Source/WebCore/loader/cache/CachedResource.cpp (working copy)
@@ -263,6 +263,8 @@
m_status = Pending;
m_request = request;
+ CachedResourceHandle<CachedResource> protect(this);
+
// All loads finish with data(allDataReceived = true) or error(), except for
// canceled loads, which silently set our request to 0. Be sure to notify our
// client in that case, so we don't seem to continue loading forever.
@@ -271,9 +273,6 @@
setStatus(Canceled);
checkNotify();
}
-
- if (canDelete() && !inCache())
- delete this;
}
void CachedResource::addClient(CachedResourceClient* client)
« no previous file with comments | « LayoutTests/platform/chromium-linux/fast/dom/HTMLLinkElement/link-and-subresource-test-nonexistent-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698