diff options
| author | Steve Block <steveblock@google.com> | 2010-04-27 16:31:00 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-11 14:42:12 +0100 |
| commit | dcc8cf2e65d1aa555cce12431a16547e66b469ee (patch) | |
| tree | 92a8d65cd5383bca9749f5327fb5e440563926e6 /WebCore/workers/WorkerScriptLoader.cpp | |
| parent | ccac38a6b48843126402088a309597e682f40fe6 (diff) | |
| download | external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.zip external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.gz external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.bz2 | |
Merge webkit.org at r58033 : Initial merge by git
Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
Diffstat (limited to 'WebCore/workers/WorkerScriptLoader.cpp')
| -rw-r--r-- | WebCore/workers/WorkerScriptLoader.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/WebCore/workers/WorkerScriptLoader.cpp b/WebCore/workers/WorkerScriptLoader.cpp index 52baf2d..fa7d3c4 100644 --- a/WebCore/workers/WorkerScriptLoader.cpp +++ b/WebCore/workers/WorkerScriptLoader.cpp @@ -63,6 +63,7 @@ void WorkerScriptLoader::loadSynchronously(ScriptExecutionContext* scriptExecuti ThreadableLoaderOptions options; options.allowCredentials = true; options.crossOriginRequestPolicy = crossOriginRequestPolicy; + options.sendLoadCallbacks = true; WorkerThreadableLoader::loadResourceSynchronously(static_cast<WorkerContext*>(scriptExecutionContext), *request, *this, options); } @@ -80,6 +81,7 @@ void WorkerScriptLoader::loadAsynchronously(ScriptExecutionContext* scriptExecut ThreadableLoaderOptions options; options.allowCredentials = true; options.crossOriginRequestPolicy = crossOriginRequestPolicy; + options.sendLoadCallbacks = true; m_threadableLoader = ThreadableLoader::create(scriptExecutionContext, this, *request, options); } |