Merge 90595

Source/WebCore/loader/cache/CachedResource.cpp

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
     Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
     Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
     Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
@@ skipping 245 matching lines @@
         return 0;
     return m_cachedMetadata.get();
 }
 
 void CachedResource::setRequest(CachedResourceRequest* request)
 {
     if (request && !m_request)
         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.
     if (!m_request && isLoading()) {
         setLoading(false);
         setStatus(Canceled);
         checkNotify();
     }
-
-    if (canDelete() && !inCache())
-        delete this;
 }
 
 void CachedResource::addClient(CachedResourceClient* client)
 {
     addClientToSet(client);
     didAddClient(client);
 }
 
 void CachedResource::didAddClient(CachedResourceClient* c)
 {
@@ skipping 336 matching lines @@
 }
     
 void CachedResource::setLoadPriority(ResourceLoadPriority loadPriority) 
 { 
     if (loadPriority == ResourceLoadPriorityUnresolved)
         return;
     m_loadPriority = loadPriority;
 }
 
 }