DocumentThreadableLoader should clear its Resource before destruction

third_party/WebKit/Source/core/loader/DocumentThreadableLoader.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  * Copyright (C) 2013, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 335 matching lines @@
             preflightOptions.allowCredentials = DoNotAllowStoredCredentials;
             loadRequest(preflightRequest, preflightOptions);
             // |this| may be dead here in async mode.
         }
     }
 }
 
 DocumentThreadableLoader::~DocumentThreadableLoader()
 {
     CHECK(!m_client);
-
-    // TODO(oilpan): Remove this once DocumentThreadableLoader is once again a ResourceOwner.
-    clearResource();
+    DCHECK(!m_resource);
 }
 
 void DocumentThreadableLoader::overrideTimeout(unsigned long timeoutMilliseconds)
 {
     ASSERT(m_async);
 
     // |m_requestStartedSeconds| == 0.0 indicates loading is already finished
     // and |m_timeoutTimer| is already stopped, and thus we do nothing for such
     // cases. See https://crbug.com/551663 for details.
     if (m_requestStartedSeconds <= 0.0)
@@ skipping 44 matching lines @@
 
 void DocumentThreadableLoader::setDefersLoading(bool value)
 {
     if (resource())
         resource()->setDefersLoading(value);
 }
 
 void DocumentThreadableLoader::clear()
 {
     m_client = nullptr;
-
-    if (!m_async)
-        return;
-
     m_timeoutTimer.stop();
     m_requestStartedSeconds = 0.0;
     clearResource();
 }
 
 // In this method, we can clear |request| to tell content::WebURLLoaderImpl of
 // Chromium not to follow the redirect. This works only when this method is
 // called by RawResource::willSendRequest(). If called by
 // RawResource::didAddClient(), clearing |request| won't be propagated
 // to content::WebURLLoaderImpl. So, this loader must also get detached from
@@ skipping 355 matching lines @@
         // preflight and actual request.
         m_timeoutTimer.stop();
         ASSERT(!m_sameOriginRequest);
         ASSERT(m_options.crossOriginRequestPolicy == UseAccessControl);
         loadActualRequest();
         // |this| may be dead here in async mode.
         return;
     }
 
     ThreadableLoaderClient* client = m_client;
-    m_client = nullptr;
-    // Don't clear the resource as the client may need to access the downloaded
-    // file which will be released when the resource is destoryed.
-    if (m_async) {
-        m_timeoutTimer.stop();
-        m_requestStartedSeconds = 0.0;
-    }
+    // Protect the resource in |didFinishLoading| in order not to release the
+    // downloaded file.
+    Persistent<Resource> resource = m_resource;
+    clear();
     client->didFinishLoading(identifier, finishTime);
     // |this| may be dead here in async mode.
 }
 
 void DocumentThreadableLoader::didTimeout(Timer<DocumentThreadableLoader>* timer)
 {
     ASSERT_UNUSED(timer, timer == &m_timeoutTimer);
 
     // Using values from net/base/net_error_list.h ERR_TIMED_OUT,
     // Same as existing FIXME above - this error should be coming from FrameLoaderClient to be identifiable.
@@ skipping 196 matching lines @@
     return m_securityOrigin ? m_securityOrigin.get() : document().getSecurityOrigin();
 }
 
 Document& DocumentThreadableLoader::document() const
 {
     ASSERT(m_document);
     return *m_document;
 }
 
 } // namespace blink