Index: Source/core/dom/Document.cpp |
diff --git a/Source/core/dom/Document.cpp b/Source/core/dom/Document.cpp |
index 0f98d181f0a27fe4b9b2eea4ce4dc67671d68113..8666812bcd27c5c7972bf6bd17ac159ad1898d19 100644 |
--- a/Source/core/dom/Document.cpp |
+++ b/Source/core/dom/Document.cpp |
@@ -212,6 +212,7 @@ |
#include "public/platform/Platform.h" |
#include "wtf/CurrentTime.h" |
#include "wtf/DateMath.h" |
+#include "wtf/Functional.h" |
#include "wtf/HashFunctions.h" |
#include "wtf/MainThread.h" |
#include "wtf/StdLibExtras.h" |
@@ -380,7 +381,7 @@ Document::Document(const DocumentInit& initializer, DocumentClassFlags documentC |
, m_paginatedForScreen(false) |
, m_compatibilityMode(NoQuirksMode) |
, m_compatibilityModeLocked(false) |
- , m_executeScriptsWaitingForResourcesTimer(this, &Document::executeScriptsWaitingForResourcesTimerFired) |
+ , m_executeScriptsWaitingForResourcesTask(WTF::bind(&Document::executeScriptsWaitingForResourcesTimerFired, this)) |
, m_hasAutofocused(false) |
, m_clearFocusedElementTimer(this, &Document::clearFocusedElementTimerFired) |
, m_domTreeVersion(++s_globalTreeVersion) |
@@ -2956,7 +2957,8 @@ void Document::didRemoveAllPendingStylesheet() |
void Document::didLoadAllScriptBlockingResources() |
{ |
- m_executeScriptsWaitingForResourcesTimer.startOneShot(0, FROM_HERE); |
+ Platform::current()->currentThread()->scheduler()->postLoadingTask( |
+ FROM_HERE, m_executeScriptsWaitingForResourcesTask.cancelAndCreate()); |
if (frame()) |
frame()->loader().client()->didRemoveAllPendingStylesheet(); |
@@ -2965,7 +2967,7 @@ void Document::didLoadAllScriptBlockingResources() |
view()->processUrlFragment(m_url); |
} |
-void Document::executeScriptsWaitingForResourcesTimerFired(Timer<Document>*) |
+void Document::executeScriptsWaitingForResourcesTimerFired() |
{ |
if (!isRenderingReady()) |
return; |