Oilpan: move ScriptLoader to the heap.

Source/core/dom/ScriptLoader.h

 /*
  * Copyright (C) 2008 Nikolas Zimmermann <zimmermann@kde.org>
  *
  * 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.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 18 matching lines @@
 #include "wtf/text/TextPosition.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 class Element;
 class ScriptLoaderClient;
 class ScriptSourceCode;
 
 
-class ScriptLoader final : private ScriptResourceClient {
+class ScriptLoader final : public NoBaseWillBeGarbageCollectedFinalized<ScriptLoader>, private ScriptResourceClient {
 public:
-    static PassOwnPtr<ScriptLoader> create(Element*, bool createdByParser, bool isEvaluated);
+    static PassOwnPtrWillBeRawPtr<ScriptLoader> create(Element* element, bool createdByParser, bool isEvaluated)
+    {
+        return adoptPtrWillBeNoop(new ScriptLoader(element, createdByParser, isEvaluated));
+    }
+
     virtual ~ScriptLoader();
+    virtual void trace(Visitor*);
 
     Element* element() const { return m_element; }
 
     enum LegacyTypeSupport { DisallowLegacyTypeInTypeAttribute, AllowLegacyTypeInTypeAttribute };
     bool prepareScript(const TextPosition& scriptStartPosition = TextPosition::minimumPosition(), LegacyTypeSupport = DisallowLegacyTypeInTypeAttribute);
 
     String scriptCharset() const { return m_characterEncoding; }
     String scriptContent() const;
     void executeScript(const ScriptSourceCode&, double* compilationFinishTime = 0);
     void execute();
@@ skipping 29 matching lines @@
     bool isScriptForEventSupported() const;
 
     bool fetchScript(const String& sourceUrl, FetchRequest::DeferOption);
 
     ScriptLoaderClient* client() const;
 
     // ResourceClient
     virtual void notifyFinished(Resource*) override;
 
     // FIXME: Oilpan: This should become a Member once ResourceClient is moved to the heap.
     Element* m_element;

[haraken, 2014/10/17 12:35:29]

Can we make this a Member?

[sof, 2014/10/17 12:55:46]

Thanks, I overlooked that -- yes, the owning script element reference can be a
traced Member now. The two objects being GCed at the same time.

     ResourcePtr<ScriptResource> m_resource;
     WTF::OrdinalNumber m_startLineNumber;
     bool m_parserInserted : 1;
     bool m_isExternalScript : 1;
     bool m_alreadyStarted : 1;
     bool m_haveFiredLoad : 1;
     bool m_willBeParserExecuted : 1; // Same as "The parser will handle executing the script."
     bool m_readyToBeParserExecuted : 1;
     bool m_willExecuteWhenDocumentFinishedParsing : 1;
     bool m_forceAsync : 1;
     bool m_willExecuteInOrder : 1;
     String m_characterEncoding;
     String m_fallbackCharacterEncoding;
 
     PendingScript m_pendingScript;
 };
 
 ScriptLoader* toScriptLoaderIfPossible(Element*);
 
-inline PassOwnPtr<ScriptLoader> ScriptLoader::create(Element* element, bool createdByParser, bool isEvaluated)
-{
-    return adoptPtr(new ScriptLoader(element, createdByParser, isEvaluated));
-}
+} // namespace blink
 
-}
-
-
-#endif
+#endif // ScriptLoader_h