Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #2

third_party/WebKit/Source/core/fetch/ScriptResource.h

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller <mueller@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
     version 2 of the License, or (at your option) any later version.
@@ skipping 31 matching lines @@
     ~ScriptResourceClient() override {}
     static ResourceClientType expectedType() { return ScriptType; }
     ResourceClientType resourceClientType() const final { return expectedType(); }
 
     virtual void notifyAppendData(ScriptResource* resource) { }
 };
 
 class CORE_EXPORT ScriptResource final : public TextResource {
 public:
     using ClientType = ScriptResourceClient;
-    static ResourcePtr<ScriptResource> fetch(FetchRequest&, ResourceFetcher*);
+    static PassRefPtrWillBeRawPtr<ScriptResource> fetch(FetchRequest&, ResourceFetcher*);
 
     // Public for testing
-    ScriptResource(const ResourceRequest&, const String& charset);
+    static PassRefPtrWillBeRawPtr<ScriptResource> create(const ResourceRequest& request, const String& charset)
+    {
+        return adoptRefWillBeNoop(new ScriptResource(request, charset));
+    }
 
     ~ScriptResource() override;
 
     void didAddClient(ResourceClient*) override;
     void appendData(const char*, size_t) override;
 
     void onMemoryDump(WebMemoryDumpLevelOfDetail, WebProcessMemoryDump*) const override;
 
     void destroyDecodedDataForFailedRevalidation() override;
 
     const CompressibleString& script();
 
     AtomicString mimeType() const;
 
     bool mimeTypeAllowedByNosniff() const;
 
     void setIntegrityMetadata(const IntegrityMetadataSet& metadata) { m_integrityMetadata = metadata; }
     const IntegrityMetadataSet& integrityMetadata() const { return m_integrityMetadata; }
     void setIntegrityAlreadyChecked(bool checked) { m_integrityChecked = checked; }
     bool integrityAlreadyChecked() { return m_integrityChecked; }
     bool mustRefetchDueToIntegrityMetadata(const FetchRequest&) const override;
 
 private:
     class ScriptResourceFactory : public ResourceFactory {
     public:
         ScriptResourceFactory()
             : ResourceFactory(Resource::Script) { }
 
-        Resource* create(const ResourceRequest& request, const String& charset) const override
+        PassRefPtrWillBeRawPtr<Resource> create(const ResourceRequest& request, const String& charset) const override
         {
-            return new ScriptResource(request, charset);
+            return adoptRefWillBeNoop(new ScriptResource(request, charset));
         }
     };
 
+    ScriptResource(const ResourceRequest&, const String& charset);
+
     bool m_integrityChecked;
     IntegrityMetadataSet m_integrityMetadata;
 
     CompressibleString m_script;
 };
 
 DEFINE_RESOURCE_TYPE_CASTS(Script);
 
 } // namespace blink
 
 #endif