diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-24 21:40:32 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-24 21:40:32 +0000 |
| commit | 2b73aec066298ca977629eb03b1bf8f61a081735 (patch) | |
| tree | 2c33d8d181c01fbc9dabd95692f1315650fc09cb /webkit | |
| parent | a31df3d3488f90bd60055fe7d42b3d51fb7ac72a (diff) | |
| download | chromium_src-2b73aec066298ca977629eb03b1bf8f61a081735.zip chromium_src-2b73aec066298ca977629eb03b1bf8f61a081735.tar.gz chromium_src-2b73aec066298ca977629eb03b1bf8f61a081735.tar.bz2 | |
Update to WebKit 46369.
This includes Drew Wilson's patch here:
http://codereview.chromium.org/159066
That CL was already reviewed by Dmitry Titov, so the only thing
to review here is the DEPS file change.
TBR=pkasting
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/159369
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21583 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/webworker_impl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/webkit/glue/webworker_impl.cc b/webkit/glue/webworker_impl.cc index c20b6839..112b85b 100644 --- a/webkit/glue/webworker_impl.cc +++ b/webkit/glue/webworker_impl.cc @@ -6,6 +6,7 @@ #include "base/compiler_specific.h" +#include "DedicatedWorkerContext.h" #include "GenericWorkerTask.h" #include "KURL.h" #include "MessagePort.h" @@ -13,7 +14,6 @@ #include "ScriptExecutionContext.h" #include "SecurityOrigin.h" #include "SubstituteData.h" -#include "WorkerContext.h" #include "WorkerThread.h" #include <wtf/MainThread.h> #include <wtf/Threading.h> @@ -122,8 +122,8 @@ void WebWorkerImpl::PostMessageToWorkerContextTask( const WebCore::String& message, WTF::PassOwnPtr<WebCore::MessagePortChannel> channel) { DCHECK(context->isWorkerContext()); - WebCore::WorkerContext* worker_context = - static_cast<WebCore::WorkerContext*>(context); + WebCore::DedicatedWorkerContext* worker_context = + static_cast<WebCore::DedicatedWorkerContext*>(context); WTF::RefPtr<WebCore::MessagePort> port; if (channel) { |