diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebCore/workers | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebCore/workers')
| -rw-r--r-- | Source/WebCore/workers/WorkerScriptLoader.cpp | 2 | ||||
| -rw-r--r-- | Source/WebCore/workers/WorkerScriptLoader.h | 2 | ||||
| -rw-r--r-- | Source/WebCore/workers/WorkerThread.cpp | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/Source/WebCore/workers/WorkerScriptLoader.cpp b/Source/WebCore/workers/WorkerScriptLoader.cpp index 2224d87..9a9051a 100644 --- a/Source/WebCore/workers/WorkerScriptLoader.cpp +++ b/Source/WebCore/workers/WorkerScriptLoader.cpp @@ -134,7 +134,7 @@ void WorkerScriptLoader::didReceiveData(const char* data, int len) m_script += m_decoder->decode(data, len); } -void WorkerScriptLoader::didFinishLoading(unsigned long identifier) +void WorkerScriptLoader::didFinishLoading(unsigned long identifier, double) { if (m_failed) return; diff --git a/Source/WebCore/workers/WorkerScriptLoader.h b/Source/WebCore/workers/WorkerScriptLoader.h index 98e21e1..4f045b5 100644 --- a/Source/WebCore/workers/WorkerScriptLoader.h +++ b/Source/WebCore/workers/WorkerScriptLoader.h @@ -59,7 +59,7 @@ namespace WebCore { virtual void didReceiveResponse(const ResourceResponse&); virtual void didReceiveData(const char* data, int lengthReceived); - virtual void didFinishLoading(unsigned long identifier); + virtual void didFinishLoading(unsigned long identifier, double); virtual void didFail(const ResourceError&); virtual void didFailRedirectCheck(); virtual void didReceiveAuthenticationCancellation(const ResourceResponse&); diff --git a/Source/WebCore/workers/WorkerThread.cpp b/Source/WebCore/workers/WorkerThread.cpp index e1f1a66..deafb0b 100644 --- a/Source/WebCore/workers/WorkerThread.cpp +++ b/Source/WebCore/workers/WorkerThread.cpp @@ -195,8 +195,6 @@ public: WorkerContext* workerContext = static_cast<WorkerContext*>(context); #if ENABLE(DATABASE) - // We currently ignore any DatabasePolicy used for the document's - // databases; if it's actually used anywhere, this should be revisited. DatabaseTaskSynchronizer cleanupSync; workerContext->stopDatabases(&cleanupSync); #endif |