Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #2

third_party/WebKit/Source/core/loader/DocumentLoader.h

 /*
  * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 17 matching lines @@
  */
 
 #ifndef DocumentLoader_h
 #define DocumentLoader_h
 
 #include "core/CoreExport.h"
 #include "core/dom/WeakIdentifierMap.h"
 #include "core/fetch/ClientHintsPreferences.h"
 #include "core/fetch/RawResource.h"
 #include "core/fetch/ResourceLoaderOptions.h"
-#include "core/fetch/ResourcePtr.h"
 #include "core/fetch/SubstituteData.h"
 #include "core/frame/csp/ContentSecurityPolicy.h"
 #include "core/loader/DocumentLoadTiming.h"
 #include "core/loader/DocumentWriter.h"
 #include "core/loader/FrameLoaderTypes.h"
 #include "core/loader/NavigationPolicy.h"
 #include "platform/SharedBuffer.h"
 #include "platform/network/ResourceError.h"
 #include "platform/network/ResourceRequest.h"
 #include "platform/network/ResourceResponse.h"
@@ skipping 88 matching lines @@
         {
         }
 
         bool wasScrolledByUser;
         bool didRestoreFromHistory;
     };
     InitialScrollState& initialScrollState() { return m_initialScrollState; }
 
     bool loadingMultipartContent() const;
 
-    ResourcePtr<Resource> startPreload(Resource::Type, FetchRequest&);
+    Resource* startPreload(Resource::Type, FetchRequest&);
 
     DECLARE_VIRTUAL_TRACE();
 
 protected:
     DocumentLoader(LocalFrame*, const ResourceRequest&, const SubstituteData&);
 
     Vector<KURL> m_redirectChain;
 
 private:
     static PassRefPtrWillBeRawPtr<DocumentWriter> createWriterFor(const Document* ownerDocument, const DocumentInit&, const AtomicString& mimeType, const AtomicString& encoding, bool dispatch, ParserSynchronizationPolicy);
@@ skipping 24 matching lines @@
 
     bool maybeLoadEmpty();
 
     bool isRedirectAfterPost(const ResourceRequest&, const ResourceResponse&);
 
     bool shouldContinueForResponse() const;
 
     RawPtrWillBeMember<LocalFrame> m_frame;
     PersistentWillBeMember<ResourceFetcher> m_fetcher;
 
-    ResourcePtr<RawResource> m_mainResource;
+    RefPtrWillBeMember<RawResource> m_mainResource;
 
     RefPtrWillBeMember<DocumentWriter> m_writer;
 
     // A reference to actual request used to create the data source.
     // The only part of this request that should change is the url, and
     // that only in the case of a same-document navigation.
     ResourceRequest m_originalRequest;
 
     SubstituteData m_substituteData;
 
@@ skipping 32 matching lines @@
     // Used to protect against reentrancy into dataReceived().
     bool m_inDataReceived;
     RefPtr<SharedBuffer> m_dataBuffer;
 };
 
 DECLARE_WEAK_IDENTIFIER_MAP(DocumentLoader);
 
 } // namespace blink
 
 #endif // DocumentLoader_h