diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-09 21:53:21 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-09 21:53:21 +0000 |
| commit | c98b9a946bff0910e1070dac51a3197dd926959e (patch) | |
| tree | c978ecdb931a5c5d09121ea0296dcbd3ffa1126c /webkit/glue/webworker_impl.h | |
| parent | 76925134ff272a3129ca38b740ed0637111f56f4 (diff) | |
| download | chromium_src-c98b9a946bff0910e1070dac51a3197dd926959e.zip chromium_src-c98b9a946bff0910e1070dac51a3197dd926959e.tar.gz chromium_src-c98b9a946bff0910e1070dac51a3197dd926959e.tar.bz2 | |
Update WebKit to r44544.
1- WorkerThread::create() now takes a WorkerLoaderProxy parameter, which I
implemented in a stub fashion on WebWorkerImpl. I'm sure the WebWorker guys
will fix this up properly.
2- Removed expirationDate and setExpirationDate members of WebURLResponse
consistent with their removal from WebCore::ResourceResponseBase. The
corresponding logic for computing cache eviction time is now part of WebCore.
3- Added wtf/DateMath.{h,cpp} to the build.
TEST=covered by existing tests, I hope!
BUG=none
R=eroman
Review URL: http://codereview.chromium.org/119387
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17983 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webworker_impl.h')
| -rw-r--r-- | webkit/glue/webworker_impl.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/webkit/glue/webworker_impl.h b/webkit/glue/webworker_impl.h index 56ad124..8c87d48 100644 --- a/webkit/glue/webworker_impl.h +++ b/webkit/glue/webworker_impl.h @@ -10,6 +10,7 @@ #if ENABLE(WORKERS) #include "ScriptExecutionContext.h" +#include "WorkerLoaderProxy.h" #include "WorkerObjectProxy.h" #include <wtf/RefPtr.h> @@ -24,6 +25,7 @@ class WorkerThread; // WebCore::WorkerObjectProxy, this class will conver to Chrome data types first // and then call the supplied WebWorkerClient. class WebWorkerImpl: public WebCore::WorkerObjectProxy, + public WebCore::WorkerLoaderProxy, public WebKit::WebWorker { public: explicit WebWorkerImpl(WebKit::WebWorkerClient* client); @@ -45,6 +47,13 @@ class WebWorkerImpl: public WebCore::WorkerObjectProxy, virtual void reportPendingActivity(bool has_pending_activity); virtual void workerContextDestroyed(); + // WebCore::WorkerLoaderProxy methods: + virtual void postTaskToLoader( + WTF::PassRefPtr<WebCore::ScriptExecutionContext::Task>); + virtual void postTaskForModeToWorkerContext( + WTF::PassRefPtr<WebCore::ScriptExecutionContext::Task>, + const WebCore::String& mode); + // WebWorker methods: virtual void startWorkerContext(const WebKit::WebURL& script_url, const WebKit::WebString& user_agent, |