Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #2

third_party/WebKit/Source/core/dom/PendingScript.h

 /*
  * Copyright (C) 2010 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 24 matching lines @@
 #include "wtf/RefPtr.h"
 #include "wtf/text/TextPosition.h"
 
 namespace blink {
 
 class Element;
 class ScriptSourceCode;
 
 // A container for an external script which may be loaded and executed.
 //
-// A ResourcePtr alone does not prevent the underlying Resource
+// A RefPtr alone does not prevent the underlying Resource
 // from purging its data buffer. This class holds a dummy client open for its
 // lifetime in order to guarantee that the data buffer will not be purged.
 class CORE_EXPORT PendingScript final : public NoBaseWillBeGarbageCollectedFinalized<PendingScript>, public ResourceOwner<ScriptResource> {
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(PendingScript);
+    WILL_BE_USING_PRE_FINALIZER(PendingScript, dispose);
 public:
     static PassOwnPtrWillBeRawPtr<PendingScript> create(Element*, ScriptResource*);
     ~PendingScript() override;
 
     PendingScript& operator=(const PendingScript&);
 
     TextPosition startingPosition() const { return m_startingPosition; }
     void setStartingPosition(const TextPosition& position) { m_startingPosition = position; }
 
     void watchForLoad(ScriptResourceClient*);
     void stopWatchingForLoad(ScriptResourceClient*);
 
     Element* element() const { return m_element.get(); }
     void setElement(Element*);
     PassRefPtrWillBeRawPtr<Element> releaseElementAndClear();
 
     void setScriptResource(ScriptResource*);
 
     void notifyFinished(Resource*) override;
     String debugName() const override { return "PendingScript"; }
     void notifyAppendData(ScriptResource*) override;
 
     DECLARE_TRACE();
 
     ScriptSourceCode getSource(const KURL& documentURL, bool& errorOccurred) const;
 
     void setStreamer(PassRefPtrWillBeRawPtr<ScriptStreamer>);
+    void streamingFinished();
 
     bool isReady() const;
 
+    void dispose();
+
 private:
     PendingScript(Element*, ScriptResource*);
 
     bool m_watchingForLoad;
     RefPtrWillBeMember<Element> m_element;
     TextPosition m_startingPosition; // Only used for inline script tags.
     bool m_integrityFailure;
 
     RefPtrWillBeMember<ScriptStreamer> m_streamer;
+    ScriptResourceClient* m_client;

[haraken, 2016/02/04 23:56:30]

In long term, we want to move ResourceClients to Oilpan's heap and use a Member
here.

[Nate Chapin, 2016/02/06 00:34:07]

Yep, someday :)

 };
 
 } // namespace blink
 
 #endif // PendingScript_h