Changeset 155416 in webkit

Timestamp:

Sep 9, 2013, 10:42:15 PM (13 years ago)

Author:

akling@apple.com

Message:

ScriptRunner should have a Document& internally.
<​https://webkit.org/b/121072>

Reviewed by Anders Carlsson.

Change ScriptRunner::m_document to a reference since it's tied to
the lifetime of the Document.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)
• dom/ScriptRunner.cpp (modified) (5 diffs)
• dom/ScriptRunner.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-09  Andreas Kling  <akling@apple.com>
+
+        ScriptRunner should have a Document& internally.
+        <https://webkit.org/b/121072>
+
+        Reviewed by Anders Carlsson.
+
+        Change ScriptRunner::m_document to a reference since it's tied to
+        the lifetime of the Document.
+
 2013-09-09  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -431 +431 @@
     , m_startTime(monotonicallyIncreasingTimeMS())
     , m_overMinimumLayoutThreshold(false)
-    , m_scriptRunner(ScriptRunner::create(this))
+    , m_scriptRunner(createOwned<ScriptRunner>(*this))
     , m_xmlVersion(ASCIILiteral("1.0"))
     , m_xmlStandalone(StandaloneUnspecified)

trunk/Source/WebCore/dom/ScriptRunner.cpp

@@ -35 +35 @@
 namespace WebCore {
 
-ScriptRunner::ScriptRunner(Document* document)
+ScriptRunner::ScriptRunner(Document& document)
     : m_document(document)
     , m_timer(this, &ScriptRunner::timerFired)
 {
-    ASSERT(document);
 }
 
@@ -45 +44 @@
 {
     for (size_t i = 0; i < m_scriptsToExecuteSoon.size(); ++i)
-        m_document->decrementLoadEventDelayCount();
+        m_document.decrementLoadEventDelayCount();
     for (size_t i = 0; i < m_scriptsToExecuteInOrder.size(); ++i)
-        m_document->decrementLoadEventDelayCount();
+        m_document.decrementLoadEventDelayCount();
     for (int i = 0; i < m_pendingAsyncScripts.size(); ++i)
-        m_document->decrementLoadEventDelayCount();
+        m_document.decrementLoadEventDelayCount();
 }
 
@@ -61 +60 @@
     ASSERT(element->inDocument());
 
-    m_document->incrementLoadEventDelayCount();
+    m_document.incrementLoadEventDelayCount();
 
     switch (executionType) {
@@ -104 +103 @@
     ASSERT_UNUSED(timer, timer == &m_timer);
 
-    RefPtr<Document> protect(m_document);
+    Ref<Document> protect(m_document);
 
     Vector<PendingScript> scripts;
@@ -120 +119 @@
         RefPtr<Element> element = scripts[i].releaseElementAndClear();
         toScriptElementIfPossible(element.get())->execute(cachedScript);
-        m_document->decrementLoadEventDelayCount();
+        m_document.decrementLoadEventDelayCount();
     }
 }

trunk/Source/WebCore/dom/ScriptRunner.h

@@ -45 +45 @@
     WTF_MAKE_NONCOPYABLE(ScriptRunner); WTF_MAKE_FAST_ALLOCATED;
 public:
-    static PassOwnPtr<ScriptRunner> create(Document* document) { return adoptPtr(new ScriptRunner(document)); }
+    explicit ScriptRunner(Document&);
     ~ScriptRunner();
 
@@ -56 +56 @@
 
 private:
-    explicit ScriptRunner(Document*);
-
     void timerFired(Timer<ScriptRunner>*);
 
-    Document* m_document;
+    Document& m_document;
     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