diff options
Diffstat (limited to 'WebCore/workers')
| -rw-r--r-- | WebCore/workers/GenericWorkerTask.h | 816 | ||||
| -rw-r--r-- | WebCore/workers/WorkerContext.cpp | 26 | ||||
| -rw-r--r-- | WebCore/workers/WorkerContext.h | 7 | ||||
| -rw-r--r-- | WebCore/workers/WorkerContext.idl | 7 | ||||
| -rw-r--r-- | WebCore/workers/WorkerScriptLoader.cpp | 2 | ||||
| -rw-r--r-- | WebCore/workers/WorkerScriptLoaderClient.h | 2 | ||||
| -rw-r--r-- | WebCore/workers/WorkerThread.cpp | 3 |
7 files changed, 445 insertions, 418 deletions
diff --git a/WebCore/workers/GenericWorkerTask.h b/WebCore/workers/GenericWorkerTask.h index a9839c6..ad16b45 100644 --- a/WebCore/workers/GenericWorkerTask.h +++ b/WebCore/workers/GenericWorkerTask.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 Google Inc. All rights reserved. + * Copyright (C) 2009-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 @@ -28,10 +28,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef GenericWorkerTask_h -#define GenericWorkerTask_h - -#if ENABLE(WORKERS) +#ifndef GenericTask_h +#define GenericTask_h #include "CrossThreadCopier.h" #include "ScriptExecutionContext.h" @@ -42,440 +40,438 @@ namespace WebCore { - // Traits for the GenericWorkerTask. - template<typename T> struct GenericWorkerTaskTraits { - typedef const T& ParamType; - }; - - template<typename T> struct GenericWorkerTaskTraits<T*> { - typedef T* ParamType; - }; - - template<typename T> struct GenericWorkerTaskTraits<PassRefPtr<T> > { - typedef PassRefPtr<T> ParamType; - }; - - template<typename T> struct GenericWorkerTaskTraits<PassOwnPtr<T> > { - typedef PassOwnPtr<T> ParamType; - }; - - template<typename P1, typename MP1> - class GenericWorkerTask1 : public ScriptExecutionContext::Task { - public: - typedef void (*Method)(ScriptExecutionContext*, MP1); - typedef GenericWorkerTask1<P1, MP1> GenericWorkerTask; - typedef typename GenericWorkerTaskTraits<P1>::ParamType Param1; - - static PassOwnPtr<GenericWorkerTask> create(Method method, Param1 parameter1) - { - return new GenericWorkerTask(method, parameter1); - } - - private: - GenericWorkerTask1(Method method, Param1 parameter1) - : m_method(method) - , m_parameter1(parameter1) - { - } - - virtual void performTask(ScriptExecutionContext* context) - { - (*m_method)(context, m_parameter1); - } - - private: - Method m_method; - P1 m_parameter1; - }; - - template<typename P1, typename MP1, typename P2, typename MP2> - class GenericWorkerTask2 : public ScriptExecutionContext::Task { - public: - typedef void (*Method)(ScriptExecutionContext*, MP1, MP2); - typedef GenericWorkerTask2<P1, MP1, P2, MP2> GenericWorkerTask; - typedef typename GenericWorkerTaskTraits<P1>::ParamType Param1; - typedef typename GenericWorkerTaskTraits<P2>::ParamType Param2; - - static PassOwnPtr<GenericWorkerTask> create(Method method, Param1 parameter1, Param2 parameter2) - { - return new GenericWorkerTask(method, parameter1, parameter2); - } - - private: - GenericWorkerTask2(Method method, Param1 parameter1, Param2 parameter2) - : m_method(method) - , m_parameter1(parameter1) - , m_parameter2(parameter2) - { - } - - virtual void performTask(ScriptExecutionContext* context) - { - (*m_method)(context, m_parameter1, m_parameter2); - } - - private: - Method m_method; - P1 m_parameter1; - P2 m_parameter2; - }; - - template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3> - class GenericWorkerTask3 : public ScriptExecutionContext::Task { - public: - typedef void (*Method)(ScriptExecutionContext*, MP1, MP2, MP3); - typedef GenericWorkerTask3<P1, MP1, P2, MP2, P3, MP3> GenericWorkerTask; - typedef typename GenericWorkerTaskTraits<P1>::ParamType Param1; - typedef typename GenericWorkerTaskTraits<P2>::ParamType Param2; - typedef typename GenericWorkerTaskTraits<P3>::ParamType Param3; - - static PassOwnPtr<GenericWorkerTask> create(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3) - { - return new GenericWorkerTask(method, parameter1, parameter2, parameter3); - } - - private: - GenericWorkerTask3(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3) - : m_method(method) - , m_parameter1(parameter1) - , m_parameter2(parameter2) - , m_parameter3(parameter3) - { - } - - virtual void performTask(ScriptExecutionContext* context) - { - (*m_method)(context, m_parameter1, m_parameter2, m_parameter3); - } - - private: - Method m_method; - P1 m_parameter1; - P2 m_parameter2; - P3 m_parameter3; - }; - - template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4> - class GenericWorkerTask4 : public ScriptExecutionContext::Task { - public: - typedef void (*Method)(ScriptExecutionContext*, MP1, MP2, MP3, MP4); - typedef GenericWorkerTask4<P1, MP1, P2, MP2, P3, MP3, P4, MP4> GenericWorkerTask; - typedef typename GenericWorkerTaskTraits<P1>::ParamType Param1; - typedef typename GenericWorkerTaskTraits<P2>::ParamType Param2; - typedef typename GenericWorkerTaskTraits<P3>::ParamType Param3; - typedef typename GenericWorkerTaskTraits<P4>::ParamType Param4; - - static PassOwnPtr<GenericWorkerTask> create(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4) - { - return new GenericWorkerTask(method, parameter1, parameter2, parameter3, parameter4); - } - - private: - GenericWorkerTask4(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4) - : m_method(method) - , m_parameter1(parameter1) - , m_parameter2(parameter2) - , m_parameter3(parameter3) - , m_parameter4(parameter4) - { - } - - virtual void performTask(ScriptExecutionContext* context) - { - (*m_method)(context, m_parameter1, m_parameter2, m_parameter3, m_parameter4); - } - - private: - Method m_method; - P1 m_parameter1; - P2 m_parameter2; - P3 m_parameter3; - P4 m_parameter4; - }; - - template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5> - class GenericWorkerTask5 : public ScriptExecutionContext::Task { - public: - typedef void (*Method)(ScriptExecutionContext*, MP1, MP2, MP3, MP4, MP5); - typedef GenericWorkerTask5<P1, MP1, P2, MP2, P3, MP3, P4, MP4, P5, MP5> GenericWorkerTask; - typedef typename GenericWorkerTaskTraits<P1>::ParamType Param1; - typedef typename GenericWorkerTaskTraits<P2>::ParamType Param2; - typedef typename GenericWorkerTaskTraits<P3>::ParamType Param3; - typedef typename GenericWorkerTaskTraits<P4>::ParamType Param4; - typedef typename GenericWorkerTaskTraits<P5>::ParamType Param5; - - static PassOwnPtr<GenericWorkerTask> create(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4, Param5 parameter5) - { - return new GenericWorkerTask(method, parameter1, parameter2, parameter3, parameter4, parameter5); - } - - private: - GenericWorkerTask5(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4, Param5 parameter5) - : m_method(method) - , m_parameter1(parameter1) - , m_parameter2(parameter2) - , m_parameter3(parameter3) - , m_parameter4(parameter4) - , m_parameter5(parameter5) - { - } - - virtual void performTask(ScriptExecutionContext* context) - { - (*m_method)(context, m_parameter1, m_parameter2, m_parameter3, m_parameter4, m_parameter5); - } - - private: - Method m_method; - P1 m_parameter1; - P2 m_parameter2; - P3 m_parameter3; - P4 m_parameter4; - P5 m_parameter5; - }; - - template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5, typename P6, typename MP6> - class GenericWorkerTask6 : public ScriptExecutionContext::Task { - public: - typedef void (*Method)(ScriptExecutionContext*, MP1, MP2, MP3, MP4, MP5, MP6); - typedef GenericWorkerTask6<P1, MP1, P2, MP2, P3, MP3, P4, MP4, P5, MP5, P6, MP6> GenericWorkerTask; - typedef typename GenericWorkerTaskTraits<P1>::ParamType Param1; - typedef typename GenericWorkerTaskTraits<P2>::ParamType Param2; - typedef typename GenericWorkerTaskTraits<P3>::ParamType Param3; - typedef typename GenericWorkerTaskTraits<P4>::ParamType Param4; - typedef typename GenericWorkerTaskTraits<P5>::ParamType Param5; - typedef typename GenericWorkerTaskTraits<P6>::ParamType Param6; - - static PassOwnPtr<GenericWorkerTask> create(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4, Param5 parameter5, Param6 parameter6) - { - return new GenericWorkerTask(method, parameter1, parameter2, parameter3, parameter4, parameter5, parameter6); - } - - private: - GenericWorkerTask6(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4, Param5 parameter5, Param6 parameter6) - : m_method(method) - , m_parameter1(parameter1) - , m_parameter2(parameter2) - , m_parameter3(parameter3) - , m_parameter4(parameter4) - , m_parameter5(parameter5) - , m_parameter6(parameter6) - { - } - - virtual void performTask(ScriptExecutionContext* context) - { - (*m_method)(context, m_parameter1, m_parameter2, m_parameter3, m_parameter4, m_parameter5, m_parameter6); - } - - private: - Method m_method; - P1 m_parameter1; - P2 m_parameter2; - P3 m_parameter3; - P4 m_parameter4; - P5 m_parameter5; - P6 m_parameter6; - }; - - template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5, typename P6, typename MP6, typename P7, typename MP7> - class GenericWorkerTask7 : public ScriptExecutionContext::Task { - public: - typedef void (*Method)(ScriptExecutionContext*, MP1, MP2, MP3, MP4, MP5, MP6, MP7); - typedef GenericWorkerTask7<P1, MP1, P2, MP2, P3, MP3, P4, MP4, P5, MP5, P6, MP6, P7, MP7> GenericWorkerTask; - typedef typename GenericWorkerTaskTraits<P1>::ParamType Param1; - typedef typename GenericWorkerTaskTraits<P2>::ParamType Param2; - typedef typename GenericWorkerTaskTraits<P3>::ParamType Param3; - typedef typename GenericWorkerTaskTraits<P4>::ParamType Param4; - typedef typename GenericWorkerTaskTraits<P5>::ParamType Param5; - typedef typename GenericWorkerTaskTraits<P6>::ParamType Param6; - typedef typename GenericWorkerTaskTraits<P7>::ParamType Param7; - - static PassOwnPtr<GenericWorkerTask> create(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4, Param5 parameter5, Param6 parameter6, Param7 parameter7) - { - return new GenericWorkerTask(method, parameter1, parameter2, parameter3, parameter4, parameter5, parameter6, parameter7); - } - - private: - GenericWorkerTask7(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4, Param5 parameter5, Param6 parameter6, Param7 parameter7) - : m_method(method) - , m_parameter1(parameter1) - , m_parameter2(parameter2) - , m_parameter3(parameter3) - , m_parameter4(parameter4) - , m_parameter5(parameter5) - , m_parameter6(parameter6) - , m_parameter7(parameter7) - { - } - - virtual void performTask(ScriptExecutionContext* context) - { - (*m_method)(context, m_parameter1, m_parameter2, m_parameter3, m_parameter4, m_parameter5, m_parameter6, m_parameter7); - } - - private: - Method m_method; - P1 m_parameter1; - P2 m_parameter2; - P3 m_parameter3; - P4 m_parameter4; - P5 m_parameter5; - P6 m_parameter6; - P7 m_parameter7; - }; - - template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5, typename P6, typename MP6, typename P7, typename MP7, typename P8, typename MP8> - class GenericWorkerTask8 : public ScriptExecutionContext::Task { - public: - typedef void (*Method)(ScriptExecutionContext*, MP1, MP2, MP3, MP4, MP5, MP6, MP7, MP8); - typedef GenericWorkerTask8<P1, MP1, P2, MP2, P3, MP3, P4, MP4, P5, MP5, P6, MP6, P7, MP7, P8, MP8> GenericWorkerTask; - typedef typename GenericWorkerTaskTraits<P1>::ParamType Param1; - typedef typename GenericWorkerTaskTraits<P2>::ParamType Param2; - typedef typename GenericWorkerTaskTraits<P3>::ParamType Param3; - typedef typename GenericWorkerTaskTraits<P4>::ParamType Param4; - typedef typename GenericWorkerTaskTraits<P5>::ParamType Param5; - typedef typename GenericWorkerTaskTraits<P6>::ParamType Param6; - typedef typename GenericWorkerTaskTraits<P7>::ParamType Param7; - typedef typename GenericWorkerTaskTraits<P8>::ParamType Param8; - - static PassOwnPtr<GenericWorkerTask> create(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4, Param5 parameter5, Param6 parameter6, Param7 parameter7, Param8 parameter8) - { - return new GenericWorkerTask(method, parameter1, parameter2, parameter3, parameter4, parameter5, parameter6, parameter7, parameter8); - } - - private: - GenericWorkerTask8(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4, Param5 parameter5, Param6 parameter6, Param7 parameter7, Param8 parameter8) +// Traits for the GenericTask. +template<typename T> struct GenericTaskTraits { + typedef const T& ParamType; +}; + +template<typename T> struct GenericTaskTraits<T*> { + typedef T* ParamType; +}; + +template<typename T> struct GenericTaskTraits<PassRefPtr<T> > { + typedef PassRefPtr<T> ParamType; +}; + +template<typename T> struct GenericTaskTraits<PassOwnPtr<T> > { + typedef PassOwnPtr<T> ParamType; +}; + +template<typename P1, typename MP1> +class GenericTask1 : public ScriptExecutionContext::Task { +public: + typedef void (*Method)(ScriptExecutionContext*, MP1); + typedef GenericTask1<P1, MP1> GenericTask; + typedef typename GenericTaskTraits<P1>::ParamType Param1; + + static PassOwnPtr<GenericTask> create(Method method, Param1 parameter1) + { + return new GenericTask(method, parameter1); + } + +private: + GenericTask1(Method method, Param1 parameter1) + : m_method(method) + , m_parameter1(parameter1) + { + } + + virtual void performTask(ScriptExecutionContext* context) + { + (*m_method)(context, m_parameter1); + } + +private: + Method m_method; + P1 m_parameter1; +}; + +template<typename P1, typename MP1, typename P2, typename MP2> +class GenericTask2 : public ScriptExecutionContext::Task { +public: + typedef void (*Method)(ScriptExecutionContext*, MP1, MP2); + typedef GenericTask2<P1, MP1, P2, MP2> GenericTask; + typedef typename GenericTaskTraits<P1>::ParamType Param1; + typedef typename GenericTaskTraits<P2>::ParamType Param2; + + static PassOwnPtr<GenericTask> create(Method method, Param1 parameter1, Param2 parameter2) + { + return new GenericTask(method, parameter1, parameter2); + } + +private: + GenericTask2(Method method, Param1 parameter1, Param2 parameter2) + : m_method(method) + , m_parameter1(parameter1) + , m_parameter2(parameter2) + { + } + + virtual void performTask(ScriptExecutionContext* context) + { + (*m_method)(context, m_parameter1, m_parameter2); + } + +private: + Method m_method; + P1 m_parameter1; + P2 m_parameter2; +}; + +template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3> +class GenericTask3 : public ScriptExecutionContext::Task { +public: + typedef void (*Method)(ScriptExecutionContext*, MP1, MP2, MP3); + typedef GenericTask3<P1, MP1, P2, MP2, P3, MP3> GenericTask; + typedef typename GenericTaskTraits<P1>::ParamType Param1; + typedef typename GenericTaskTraits<P2>::ParamType Param2; + typedef typename GenericTaskTraits<P3>::ParamType Param3; + + static PassOwnPtr<GenericTask> create(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3) + { + return new GenericTask(method, parameter1, parameter2, parameter3); + } + +private: + GenericTask3(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3) + : m_method(method) + , m_parameter1(parameter1) + , m_parameter2(parameter2) + , m_parameter3(parameter3) + { + } + + virtual void performTask(ScriptExecutionContext* context) + { + (*m_method)(context, m_parameter1, m_parameter2, m_parameter3); + } + +private: + Method m_method; + P1 m_parameter1; + P2 m_parameter2; + P3 m_parameter3; +}; + +template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4> +class GenericTask4 : public ScriptExecutionContext::Task { +public: + typedef void (*Method)(ScriptExecutionContext*, MP1, MP2, MP3, MP4); + typedef GenericTask4<P1, MP1, P2, MP2, P3, MP3, P4, MP4> GenericTask; + typedef typename GenericTaskTraits<P1>::ParamType Param1; + typedef typename GenericTaskTraits<P2>::ParamType Param2; + typedef typename GenericTaskTraits<P3>::ParamType Param3; + typedef typename GenericTaskTraits<P4>::ParamType Param4; + + static PassOwnPtr<GenericTask> create(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4) + { + return new GenericTask(method, parameter1, parameter2, parameter3, parameter4); + } + +private: + GenericTask4(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4) + : m_method(method) + , m_parameter1(parameter1) + , m_parameter2(parameter2) + , m_parameter3(parameter3) + , m_parameter4(parameter4) + { + } + + virtual void performTask(ScriptExecutionContext* context) + { + (*m_method)(context, m_parameter1, m_parameter2, m_parameter3, m_parameter4); + } + +private: + Method m_method; + P1 m_parameter1; + P2 m_parameter2; + P3 m_parameter3; + P4 m_parameter4; +}; + +template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5> +class GenericTask5 : public ScriptExecutionContext::Task { +public: + typedef void (*Method)(ScriptExecutionContext*, MP1, MP2, MP3, MP4, MP5); + typedef GenericTask5<P1, MP1, P2, MP2, P3, MP3, P4, MP4, P5, MP5> GenericTask; + typedef typename GenericTaskTraits<P1>::ParamType Param1; + typedef typename GenericTaskTraits<P2>::ParamType Param2; + typedef typename GenericTaskTraits<P3>::ParamType Param3; + typedef typename GenericTaskTraits<P4>::ParamType Param4; + typedef typename GenericTaskTraits<P5>::ParamType Param5; + + static PassOwnPtr<GenericTask> create(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4, Param5 parameter5) + { + return new GenericTask(method, parameter1, parameter2, parameter3, parameter4, parameter5); + } + +private: + GenericTask5(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4, Param5 parameter5) : m_method(method) , m_parameter1(parameter1) , m_parameter2(parameter2) , m_parameter3(parameter3) , m_parameter4(parameter4) , m_parameter5(parameter5) - , m_parameter6(parameter6) - , m_parameter7(parameter7) - , m_parameter8(parameter8) - { - } - - virtual void performTask(ScriptExecutionContext* context) - { - (*m_method)(context, m_parameter1, m_parameter2, m_parameter3, m_parameter4, m_parameter5, m_parameter6, m_parameter7, m_parameter8); - } - - private: - Method m_method; - P1 m_parameter1; - P2 m_parameter2; - P3 m_parameter3; - P4 m_parameter4; - P5 m_parameter5; - P6 m_parameter6; - P7 m_parameter7; - P8 m_parameter8; - }; - - template<typename P1, typename MP1> - PassOwnPtr<ScriptExecutionContext::Task> createCallbackTask( - void (*method)(ScriptExecutionContext*, MP1), - const P1& parameter1) { - return GenericWorkerTask1<typename CrossThreadCopier<P1>::Type, MP1>::create( - method, - CrossThreadCopier<P1>::copy(parameter1)); } - template<typename P1, typename MP1, typename P2, typename MP2> - PassOwnPtr<ScriptExecutionContext::Task> createCallbackTask( - void (*method)(ScriptExecutionContext*, MP1, MP2), - const P1& parameter1, const P2& parameter2) + virtual void performTask(ScriptExecutionContext* context) { - return GenericWorkerTask2<typename CrossThreadCopier<P1>::Type, MP1, typename CrossThreadCopier<P2>::Type, MP2>::create( - method, - CrossThreadCopier<P1>::copy(parameter1), CrossThreadCopier<P2>::copy(parameter2)); + (*m_method)(context, m_parameter1, m_parameter2, m_parameter3, m_parameter4, m_parameter5); } - template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3> - PassOwnPtr<ScriptExecutionContext::Task> createCallbackTask( - void (*method)(ScriptExecutionContext*, MP1, MP2, MP3), - const P1& parameter1, const P2& parameter2, const P3& parameter3) +private: + Method m_method; + P1 m_parameter1; + P2 m_parameter2; + P3 m_parameter3; + P4 m_parameter4; + P5 m_parameter5; +}; + +template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5, typename P6, typename MP6> +class GenericTask6 : public ScriptExecutionContext::Task { +public: + typedef void (*Method)(ScriptExecutionContext*, MP1, MP2, MP3, MP4, MP5, MP6); + typedef GenericTask6<P1, MP1, P2, MP2, P3, MP3, P4, MP4, P5, MP5, P6, MP6> GenericTask; + typedef typename GenericTaskTraits<P1>::ParamType Param1; + typedef typename GenericTaskTraits<P2>::ParamType Param2; + typedef typename GenericTaskTraits<P3>::ParamType Param3; + typedef typename GenericTaskTraits<P4>::ParamType Param4; + typedef typename GenericTaskTraits<P5>::ParamType Param5; + typedef typename GenericTaskTraits<P6>::ParamType Param6; + + static PassOwnPtr<GenericTask> create(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4, Param5 parameter5, Param6 parameter6) { - return GenericWorkerTask3<typename CrossThreadCopier<P1>::Type, MP1, typename CrossThreadCopier<P2>::Type, MP2, typename CrossThreadCopier<P3>::Type, MP3>::create( - method, - CrossThreadCopier<P1>::copy(parameter1), CrossThreadCopier<P2>::copy(parameter2), - CrossThreadCopier<P3>::copy(parameter3)); + return new GenericTask(method, parameter1, parameter2, parameter3, parameter4, parameter5, parameter6); } - template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4> - PassOwnPtr<ScriptExecutionContext::Task> createCallbackTask( - void (*method)(ScriptExecutionContext*, MP1, MP2, MP3, MP4), - const P1& parameter1, const P2& parameter2, const P3& parameter3, const P4& parameter4) +private: + GenericTask6(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4, Param5 parameter5, Param6 parameter6) + : m_method(method) + , m_parameter1(parameter1) + , m_parameter2(parameter2) + , m_parameter3(parameter3) + , m_parameter4(parameter4) + , m_parameter5(parameter5) + , m_parameter6(parameter6) + { + } + + virtual void performTask(ScriptExecutionContext* context) { - return GenericWorkerTask4<typename CrossThreadCopier<P1>::Type, MP1, typename CrossThreadCopier<P2>::Type, MP2, typename CrossThreadCopier<P3>::Type, MP3, - typename CrossThreadCopier<P4>::Type, MP4>::create( - method, - CrossThreadCopier<P1>::copy(parameter1), CrossThreadCopier<P2>::copy(parameter2), - CrossThreadCopier<P3>::copy(parameter3), CrossThreadCopier<P4>::copy(parameter4)); + (*m_method)(context, m_parameter1, m_parameter2, m_parameter3, m_parameter4, m_parameter5, m_parameter6); } - template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5> - PassOwnPtr<ScriptExecutionContext::Task> createCallbackTask( - void (*method)(ScriptExecutionContext*, MP1, MP2, MP3, MP4, MP5), - const P1& parameter1, const P2& parameter2, const P3& parameter3, const P4& parameter4, const P5& parameter5) +private: + Method m_method; + P1 m_parameter1; + P2 m_parameter2; + P3 m_parameter3; + P4 m_parameter4; + P5 m_parameter5; + P6 m_parameter6; +}; + +template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5, typename P6, typename MP6, typename P7, typename MP7> +class GenericTask7 : public ScriptExecutionContext::Task { +public: + typedef void (*Method)(ScriptExecutionContext*, MP1, MP2, MP3, MP4, MP5, MP6, MP7); + typedef GenericTask7<P1, MP1, P2, MP2, P3, MP3, P4, MP4, P5, MP5, P6, MP6, P7, MP7> GenericTask; + typedef typename GenericTaskTraits<P1>::ParamType Param1; + typedef typename GenericTaskTraits<P2>::ParamType Param2; + typedef typename GenericTaskTraits<P3>::ParamType Param3; + typedef typename GenericTaskTraits<P4>::ParamType Param4; + typedef typename GenericTaskTraits<P5>::ParamType Param5; + typedef typename GenericTaskTraits<P6>::ParamType Param6; + typedef typename GenericTaskTraits<P7>::ParamType Param7; + + static PassOwnPtr<GenericTask> create(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4, Param5 parameter5, Param6 parameter6, Param7 parameter7) { - return GenericWorkerTask5<typename CrossThreadCopier<P1>::Type, MP1, typename CrossThreadCopier<P2>::Type, MP2, typename CrossThreadCopier<P3>::Type, MP3, - typename CrossThreadCopier<P4>::Type, MP4, typename CrossThreadCopier<P5>::Type, MP5>::create( - method, - CrossThreadCopier<P1>::copy(parameter1), CrossThreadCopier<P2>::copy(parameter2), - CrossThreadCopier<P3>::copy(parameter3), CrossThreadCopier<P4>::copy(parameter4), - CrossThreadCopier<P5>::copy(parameter5)); + return new GenericTask(method, parameter1, parameter2, parameter3, parameter4, parameter5, parameter6, parameter7); } - template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5, typename P6, typename MP6> - PassOwnPtr<ScriptExecutionContext::Task> createCallbackTask( - void (*method)(ScriptExecutionContext*, MP1, MP2, MP3, MP4, MP5, MP6), - const P1& parameter1, const P2& parameter2, const P3& parameter3, const P4& parameter4, const P5& parameter5, const P6& parameter6) +private: + GenericTask7(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4, Param5 parameter5, Param6 parameter6, Param7 parameter7) + : m_method(method) + , m_parameter1(parameter1) + , m_parameter2(parameter2) + , m_parameter3(parameter3) + , m_parameter4(parameter4) + , m_parameter5(parameter5) + , m_parameter6(parameter6) + , m_parameter7(parameter7) { - return GenericWorkerTask6<typename CrossThreadCopier<P1>::Type, MP1, typename CrossThreadCopier<P2>::Type, MP2, typename CrossThreadCopier<P3>::Type, MP3, - typename CrossThreadCopier<P4>::Type, MP4, typename CrossThreadCopier<P5>::Type, MP5, typename CrossThreadCopier<P6>::Type, MP6>::create( - method, - CrossThreadCopier<P1>::copy(parameter1), CrossThreadCopier<P2>::copy(parameter2), - CrossThreadCopier<P3>::copy(parameter3), CrossThreadCopier<P4>::copy(parameter4), - CrossThreadCopier<P5>::copy(parameter5), CrossThreadCopier<P6>::copy(parameter6)); } - template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5, typename P6, typename MP6, typename P7, typename MP7> - PassOwnPtr<ScriptExecutionContext::Task> createCallbackTask( - void (*method)(ScriptExecutionContext*, MP1, MP2, MP3, MP4, MP5, MP6, MP7), - const P1& parameter1, const P2& parameter2, const P3& parameter3, const P4& parameter4, const P5& parameter5, const P6& parameter6, const P7& parameter7) + virtual void performTask(ScriptExecutionContext* context) { - return GenericWorkerTask7<typename CrossThreadCopier<P1>::Type, MP1, typename CrossThreadCopier<P2>::Type, MP2, typename CrossThreadCopier<P3>::Type, MP3, - typename CrossThreadCopier<P4>::Type, MP4, typename CrossThreadCopier<P5>::Type, MP5, typename CrossThreadCopier<P6>::Type, MP6, - typename CrossThreadCopier<P7>::Type, MP7>::create( - method, - CrossThreadCopier<P1>::copy(parameter1), CrossThreadCopier<P2>::copy(parameter2), - CrossThreadCopier<P3>::copy(parameter3), CrossThreadCopier<P4>::copy(parameter4), - CrossThreadCopier<P5>::copy(parameter5), CrossThreadCopier<P6>::copy(parameter6), - CrossThreadCopier<P7>::copy(parameter7)); + (*m_method)(context, m_parameter1, m_parameter2, m_parameter3, m_parameter4, m_parameter5, m_parameter6, m_parameter7); } - template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5, typename P6, typename MP6, typename P7, typename MP7, typename P8, typename MP8> - PassOwnPtr<ScriptExecutionContext::Task> createCallbackTask( - void (*method)(ScriptExecutionContext*, MP1, MP2, MP3, MP4, MP5, MP6, MP7, MP8), - const P1& parameter1, const P2& parameter2, const P3& parameter3, const P4& parameter4, const P5& parameter5, const P6& parameter6, const P7& parameter7, const P8& parameter8) +private: + Method m_method; + P1 m_parameter1; + P2 m_parameter2; + P3 m_parameter3; + P4 m_parameter4; + P5 m_parameter5; + P6 m_parameter6; + P7 m_parameter7; +}; + +template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5, typename P6, typename MP6, typename P7, typename MP7, typename P8, typename MP8> +class GenericTask8 : public ScriptExecutionContext::Task { +public: + typedef void (*Method)(ScriptExecutionContext*, MP1, MP2, MP3, MP4, MP5, MP6, MP7, MP8); + typedef GenericTask8<P1, MP1, P2, MP2, P3, MP3, P4, MP4, P5, MP5, P6, MP6, P7, MP7, P8, MP8> GenericTask; + typedef typename GenericTaskTraits<P1>::ParamType Param1; + typedef typename GenericTaskTraits<P2>::ParamType Param2; + typedef typename GenericTaskTraits<P3>::ParamType Param3; + typedef typename GenericTaskTraits<P4>::ParamType Param4; + typedef typename GenericTaskTraits<P5>::ParamType Param5; + typedef typename GenericTaskTraits<P6>::ParamType Param6; + typedef typename GenericTaskTraits<P7>::ParamType Param7; + typedef typename GenericTaskTraits<P8>::ParamType Param8; + + static PassOwnPtr<GenericTask> create(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4, Param5 parameter5, Param6 parameter6, Param7 parameter7, Param8 parameter8) { - return GenericWorkerTask8<typename CrossThreadCopier<P1>::Type, MP1, typename CrossThreadCopier<P2>::Type, MP2, typename CrossThreadCopier<P3>::Type, MP3, - typename CrossThreadCopier<P4>::Type, MP4, typename CrossThreadCopier<P5>::Type, MP5, typename CrossThreadCopier<P6>::Type, MP6, - typename CrossThreadCopier<P7>::Type, MP7, typename CrossThreadCopier<P8>::Type, MP8>::create( - method, - CrossThreadCopier<P1>::copy(parameter1), CrossThreadCopier<P2>::copy(parameter2), - CrossThreadCopier<P3>::copy(parameter3), CrossThreadCopier<P4>::copy(parameter4), - CrossThreadCopier<P5>::copy(parameter5), CrossThreadCopier<P6>::copy(parameter6), - CrossThreadCopier<P7>::copy(parameter7), CrossThreadCopier<P8>::copy(parameter8)); + return new GenericTask(method, parameter1, parameter2, parameter3, parameter4, parameter5, parameter6, parameter7, parameter8); + } + +private: + GenericTask8(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4, Param5 parameter5, Param6 parameter6, Param7 parameter7, Param8 parameter8) + : m_method(method) + , m_parameter1(parameter1) + , m_parameter2(parameter2) + , m_parameter3(parameter3) + , m_parameter4(parameter4) + , m_parameter5(parameter5) + , m_parameter6(parameter6) + , m_parameter7(parameter7) + , m_parameter8(parameter8) + { + } + + virtual void performTask(ScriptExecutionContext* context) + { + (*m_method)(context, m_parameter1, m_parameter2, m_parameter3, m_parameter4, m_parameter5, m_parameter6, m_parameter7, m_parameter8); } + +private: + Method m_method; + P1 m_parameter1; + P2 m_parameter2; + P3 m_parameter3; + P4 m_parameter4; + P5 m_parameter5; + P6 m_parameter6; + P7 m_parameter7; + P8 m_parameter8; +}; + +template<typename P1, typename MP1> +PassOwnPtr<ScriptExecutionContext::Task> createCallbackTask( + void (*method)(ScriptExecutionContext*, MP1), + const P1& parameter1) +{ + return GenericTask1<typename CrossThreadCopier<P1>::Type, MP1>::create( + method, + CrossThreadCopier<P1>::copy(parameter1)); +} + +template<typename P1, typename MP1, typename P2, typename MP2> +PassOwnPtr<ScriptExecutionContext::Task> createCallbackTask( + void (*method)(ScriptExecutionContext*, MP1, MP2), + const P1& parameter1, const P2& parameter2) +{ + return GenericTask2<typename CrossThreadCopier<P1>::Type, MP1, typename CrossThreadCopier<P2>::Type, MP2>::create( + method, + CrossThreadCopier<P1>::copy(parameter1), CrossThreadCopier<P2>::copy(parameter2)); +} + +template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3> +PassOwnPtr<ScriptExecutionContext::Task> createCallbackTask( + void (*method)(ScriptExecutionContext*, MP1, MP2, MP3), + const P1& parameter1, const P2& parameter2, const P3& parameter3) +{ + return GenericTask3<typename CrossThreadCopier<P1>::Type, MP1, typename CrossThreadCopier<P2>::Type, MP2, typename CrossThreadCopier<P3>::Type, MP3>::create( + method, + CrossThreadCopier<P1>::copy(parameter1), CrossThreadCopier<P2>::copy(parameter2), + CrossThreadCopier<P3>::copy(parameter3)); +} + +template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4> +PassOwnPtr<ScriptExecutionContext::Task> createCallbackTask( + void (*method)(ScriptExecutionContext*, MP1, MP2, MP3, MP4), + const P1& parameter1, const P2& parameter2, const P3& parameter3, const P4& parameter4) +{ + return GenericTask4<typename CrossThreadCopier<P1>::Type, MP1, typename CrossThreadCopier<P2>::Type, MP2, typename CrossThreadCopier<P3>::Type, MP3, + typename CrossThreadCopier<P4>::Type, MP4>::create( + method, + CrossThreadCopier<P1>::copy(parameter1), CrossThreadCopier<P2>::copy(parameter2), + CrossThreadCopier<P3>::copy(parameter3), CrossThreadCopier<P4>::copy(parameter4)); +} + +template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5> +PassOwnPtr<ScriptExecutionContext::Task> createCallbackTask( + void (*method)(ScriptExecutionContext*, MP1, MP2, MP3, MP4, MP5), + const P1& parameter1, const P2& parameter2, const P3& parameter3, const P4& parameter4, const P5& parameter5) +{ + return GenericTask5<typename CrossThreadCopier<P1>::Type, MP1, typename CrossThreadCopier<P2>::Type, MP2, typename CrossThreadCopier<P3>::Type, MP3, + typename CrossThreadCopier<P4>::Type, MP4, typename CrossThreadCopier<P5>::Type, MP5>::create( + method, + CrossThreadCopier<P1>::copy(parameter1), CrossThreadCopier<P2>::copy(parameter2), + CrossThreadCopier<P3>::copy(parameter3), CrossThreadCopier<P4>::copy(parameter4), + CrossThreadCopier<P5>::copy(parameter5)); +} + +template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5, typename P6, typename MP6> +PassOwnPtr<ScriptExecutionContext::Task> createCallbackTask( + void (*method)(ScriptExecutionContext*, MP1, MP2, MP3, MP4, MP5, MP6), + const P1& parameter1, const P2& parameter2, const P3& parameter3, const P4& parameter4, const P5& parameter5, const P6& parameter6) +{ + return GenericTask6<typename CrossThreadCopier<P1>::Type, MP1, typename CrossThreadCopier<P2>::Type, MP2, typename CrossThreadCopier<P3>::Type, MP3, + typename CrossThreadCopier<P4>::Type, MP4, typename CrossThreadCopier<P5>::Type, MP5, typename CrossThreadCopier<P6>::Type, MP6>::create( + method, + CrossThreadCopier<P1>::copy(parameter1), CrossThreadCopier<P2>::copy(parameter2), + CrossThreadCopier<P3>::copy(parameter3), CrossThreadCopier<P4>::copy(parameter4), + CrossThreadCopier<P5>::copy(parameter5), CrossThreadCopier<P6>::copy(parameter6)); +} + +template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5, typename P6, typename MP6, typename P7, typename MP7> +PassOwnPtr<ScriptExecutionContext::Task> createCallbackTask( + void (*method)(ScriptExecutionContext*, MP1, MP2, MP3, MP4, MP5, MP6, MP7), + const P1& parameter1, const P2& parameter2, const P3& parameter3, const P4& parameter4, const P5& parameter5, const P6& parameter6, const P7& parameter7) +{ + return GenericTask7<typename CrossThreadCopier<P1>::Type, MP1, typename CrossThreadCopier<P2>::Type, MP2, typename CrossThreadCopier<P3>::Type, MP3, + typename CrossThreadCopier<P4>::Type, MP4, typename CrossThreadCopier<P5>::Type, MP5, typename CrossThreadCopier<P6>::Type, MP6, + typename CrossThreadCopier<P7>::Type, MP7>::create( + method, + CrossThreadCopier<P1>::copy(parameter1), CrossThreadCopier<P2>::copy(parameter2), + CrossThreadCopier<P3>::copy(parameter3), CrossThreadCopier<P4>::copy(parameter4), + CrossThreadCopier<P5>::copy(parameter5), CrossThreadCopier<P6>::copy(parameter6), + CrossThreadCopier<P7>::copy(parameter7)); +} + +template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5, typename P6, typename MP6, typename P7, typename MP7, typename P8, typename MP8> +PassOwnPtr<ScriptExecutionContext::Task> createCallbackTask( + void (*method)(ScriptExecutionContext*, MP1, MP2, MP3, MP4, MP5, MP6, MP7, MP8), + const P1& parameter1, const P2& parameter2, const P3& parameter3, const P4& parameter4, const P5& parameter5, const P6& parameter6, const P7& parameter7, const P8& parameter8) +{ + return GenericTask8<typename CrossThreadCopier<P1>::Type, MP1, typename CrossThreadCopier<P2>::Type, MP2, typename CrossThreadCopier<P3>::Type, MP3, + typename CrossThreadCopier<P4>::Type, MP4, typename CrossThreadCopier<P5>::Type, MP5, typename CrossThreadCopier<P6>::Type, MP6, + typename CrossThreadCopier<P7>::Type, MP7, typename CrossThreadCopier<P8>::Type, MP8>::create( + method, + CrossThreadCopier<P1>::copy(parameter1), CrossThreadCopier<P2>::copy(parameter2), + CrossThreadCopier<P3>::copy(parameter3), CrossThreadCopier<P4>::copy(parameter4), + CrossThreadCopier<P5>::copy(parameter5), CrossThreadCopier<P6>::copy(parameter6), + CrossThreadCopier<P7>::copy(parameter7), CrossThreadCopier<P8>::copy(parameter8)); +} } // namespace WebCore -#endif // ENABLE(WORKERS) - -#endif // GenericWorkerTask_h +#endif // GenericTask_h diff --git a/WebCore/workers/WorkerContext.cpp b/WebCore/workers/WorkerContext.cpp index 30c6c9b..bf893d2 100644 --- a/WebCore/workers/WorkerContext.cpp +++ b/WebCore/workers/WorkerContext.cpp @@ -32,6 +32,7 @@ #include "WorkerContext.h" #include "ActiveDOMObject.h" +#include "DatabaseTracker.h" #include "DOMTimer.h" #include "DOMWindow.h" #include "Database.h" @@ -270,16 +271,35 @@ NotificationCenter* WorkerContext::webkitNotifications() const #if ENABLE(DATABASE) PassRefPtr<Database> WorkerContext::openDatabase(const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode& ec) { + if (!securityOrigin()->canAccessDatabase() || !Database::isAvailable()) { + ec = SECURITY_ERR; + return 0; + } + + return Database::openDatabase(this, name, version, displayName, estimatedSize, creationCallback, ec); +} + +void WorkerContext::databaseExceededQuota(const String&) +{ +#if !PLATFORM(CHROMIUM) + // FIXME: This needs a real implementation; this is a temporary solution for testing. + const unsigned long long defaultQuota = 5 * 1024 * 1024; + DatabaseTracker::tracker().setQuota(securityOrigin(), defaultQuota); +#endif +} + +PassRefPtr<DatabaseSync> WorkerContext::openDatabaseSync(const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode& ec) +{ if (!securityOrigin()->canAccessDatabase()) { ec = SECURITY_ERR; return 0; } - ASSERT(Database::isAvailable()); - if (!Database::isAvailable()) + ASSERT(DatabaseSync::isAvailable()); + if (!DatabaseSync::isAvailable()) return 0; - return Database::openDatabase(this, name, version, displayName, estimatedSize, creationCallback, ec); + return DatabaseSync::openDatabaseSync(this, name, version, displayName, estimatedSize, creationCallback, ec); } #endif diff --git a/WebCore/workers/WorkerContext.h b/WebCore/workers/WorkerContext.h index 91300c3..d05329e 100644 --- a/WebCore/workers/WorkerContext.h +++ b/WebCore/workers/WorkerContext.h @@ -31,6 +31,7 @@ #include "AtomicStringHash.h" #include "Database.h" +#include "DatabaseSync.h" #include "DatabaseCallback.h" #include "EventListener.h" #include "EventNames.h" @@ -105,10 +106,12 @@ namespace WebCore { #if ENABLE(DATABASE) // HTML 5 client-side database PassRefPtr<Database> openDatabase(const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode&); + PassRefPtr<DatabaseSync> openDatabaseSync(const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode&); + // Not implemented yet. virtual bool isDatabaseReadOnly() const { return false; } - // Not implemented yet. - virtual void databaseExceededQuota(const String&) { } + // Not implemented for real yet. + virtual void databaseExceededQuota(const String&); #endif virtual bool isContextThread() const; virtual bool isJSExecutionTerminated() const; diff --git a/WebCore/workers/WorkerContext.idl b/WebCore/workers/WorkerContext.idl index ccc2588..8567324 100644 --- a/WebCore/workers/WorkerContext.idl +++ b/WebCore/workers/WorkerContext.idl @@ -49,8 +49,11 @@ module threads { // WorkerUtils [Custom] void importScripts(/*[Variadic] in DOMString urls */); attribute [Replaceable] WorkerNavigator navigator; - // Database openDatabase(in DOMString name, in DOMString version, in DOMString displayName, in unsigned long estimatedSize); - // DatabaseSync openDatabaseSync(in DOMString name, in DOMString version, in DOMString displayName, in unsigned long estimatedSize); +#if defined(ENABLE_DATABASE) && ENABLE_DATABASE + [EnabledAtRuntime, Custom] Database openDatabase(in DOMString name, in DOMString version, in DOMString displayName, in unsigned long estimatedSize, in DatabaseCallback creationCallback) + raises(DOMException); + [EnabledAtRuntime, Custom] DatabaseSync openDatabaseSync(in DOMString name, in DOMString version, in DOMString displayName, in unsigned long estimatedSize, in DatabaseCallback creationCallback); +#endif // Timers [Custom] long setTimeout(in TimeoutHandler handler, in long timeout); diff --git a/WebCore/workers/WorkerScriptLoader.cpp b/WebCore/workers/WorkerScriptLoader.cpp index 78f3d48..ee0771f 100644 --- a/WebCore/workers/WorkerScriptLoader.cpp +++ b/WebCore/workers/WorkerScriptLoader.cpp @@ -102,6 +102,8 @@ void WorkerScriptLoader::didReceiveResponse(const ResourceResponse& response) return; } m_responseEncoding = response.textEncodingName(); + if (m_client) + m_client->didReceiveResponse(response); } void WorkerScriptLoader::didReceiveData(const char* data, int len) diff --git a/WebCore/workers/WorkerScriptLoaderClient.h b/WebCore/workers/WorkerScriptLoaderClient.h index 7dc3a1e..7004ea6 100644 --- a/WebCore/workers/WorkerScriptLoaderClient.h +++ b/WebCore/workers/WorkerScriptLoaderClient.h @@ -34,6 +34,8 @@ namespace WebCore { class WorkerScriptLoaderClient { public: + virtual void didReceiveResponse(const ResourceResponse&) { } + // FIXME: notifyFinished() is not currently guaranteed to be invoked if used from worker context and the worker shuts down in the middle of an operation. // This will cause leaks when we support nested workers. virtual void notifyFinished() { } diff --git a/WebCore/workers/WorkerThread.cpp b/WebCore/workers/WorkerThread.cpp index 52466bf..96ca89b 100644 --- a/WebCore/workers/WorkerThread.cpp +++ b/WebCore/workers/WorkerThread.cpp @@ -169,6 +169,8 @@ public: { ASSERT(context->isWorkerContext()); WorkerContext* workerContext = static_cast<WorkerContext*>(context); + // It's not safe to call clearScript until all the cleanup tasks posted by functions initiated by WorkerThreadShutdownStartTask have completed. + workerContext->clearScript(); workerContext->thread()->runLoop().terminate(); } @@ -199,7 +201,6 @@ public: // Event listeners would keep DOMWrapperWorld objects alive for too long. Also, they have references to JS objects, // which become dangling once Heap is destroyed. workerContext->removeAllEventListeners(); - workerContext->clearScript(); #if ENABLE(DATABASE) // We wait for the database thread to clean up all its stuff so that we |