Refactor Script(Loader|Runner): don't access Resources all over the place...

Source/core/dom/ScriptRunner.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 20 matching lines @@
 #include "platform/heap/Handle.h"
 #include "wtf/HashMap.h"
 #include "wtf/Noncopyable.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 
 class ScriptResource;
 class Document;
-class PendingScript;
 class ScriptLoader;
 
 class ScriptRunner final : public NoBaseWillBeGarbageCollectedFinalized<ScriptRunner> {
     WTF_MAKE_NONCOPYABLE(ScriptRunner); WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
 public:
     static PassOwnPtrWillBeRawPtr<ScriptRunner> create(Document* document)
     {
         return adoptPtrWillBeNoop(new ScriptRunner(document));
     }
     ~ScriptRunner();
 
     enum ExecutionType { ASYNC_EXECUTION, IN_ORDER_EXECUTION };
-    void queueScriptForExecution(ScriptLoader*, ResourcePtr<ScriptResource>, ExecutionType);
+    void queueScriptForExecution(ScriptLoader*, ExecutionType);
     bool hasPendingScripts() const { return !m_scriptsToExecuteSoon.isEmpty() || !m_scriptsToExecuteInOrder.isEmpty() || !m_pendingAsyncScripts.isEmpty(); }
     void suspend();
     void resume();
     void notifyScriptReady(ScriptLoader*, ExecutionType);
     void notifyScriptLoadError(ScriptLoader*, ExecutionType);
 
     void movePendingAsyncScript(ScriptRunner*, ScriptLoader*);
 
     void trace(Visitor*);
 
 private:
     explicit ScriptRunner(Document*);
 
     void timerFired(Timer<ScriptRunner>*);
 
-    void addPendingAsyncScript(ScriptLoader*, const PendingScript&);
+    void addPendingAsyncScript(ScriptLoader*);
 
     RawPtrWillBeMember<Document> m_document;
-    // FIXME: Oilpan: consider using heap vectors and hash map here;
-    // PendingScript does have a (trivial) destructor, however.
-    Vector<PendingScript> m_scriptsToExecuteInOrder;
-    Vector<PendingScript> m_scriptsToExecuteSoon; // http://www.whatwg.org/specs/web-apps/current-work/#set-of-scripts-that-will-execute-as-soon-as-possible
-    WillBeHeapHashMap<ScriptLoader*, PendingScript> m_pendingAsyncScripts;
+    // FIXME: Oilpan: what to do with these?

[haraken, 2014/10/15 15:09:41]

You can remove this comment now. This comment was about PendingScript.

[marja, 2014/10/16 15:19:04]

Done.

+    Vector<ScriptLoader*> m_scriptsToExecuteInOrder;
+    Vector<ScriptLoader*> m_scriptsToExecuteSoon; // http://www.whatwg.org/specs/web-apps/current-work/#set-of-scripts-that-will-execute-as-soon-as-possible
+    HashSet<ScriptLoader*> m_pendingAsyncScripts;

[haraken, 2014/10/15 15:09:41]

Just help me understand: You're using raw pointers to ScriptLoader but who owns
the ScriptLoader? (i.e., who guarantees that these raw ScriptLoaders don't
become stale pointers?)

[marja, 2014/10/16 15:19:04]

That didn't change with this CL; ScriptLoader is owned by... hmm... Element, I
think.

ScriptRunner only accesses the ScriptLoaders if the ScriptLoaders tell them
they're finished, so it can theoretically happen that during ramp-down, these
pointers are stale but never accessed. But that was the same situation before
too (it's possible that the ScriptLoaders never notify about the PendingScripts
being finished).

     Timer<ScriptRunner> m_timer;
 };
 
 }
 
 #endif