From 4a319569b07deb0f0156dec3fea1604b23a20071 Mon Sep 17 00:00:00 2001 From: "jam@chromium.org" Date: Tue, 10 Mar 2009 19:16:51 +0000 Subject: Fix build breaks after webkit merge. Review URL: http://codereview.chromium.org/42004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11361 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/glue/webworker.h | 1 + webkit/glue/webworker_impl.cc | 2 ++ webkit/glue/webworker_impl.h | 1 + webkit/glue/webworkerclient_impl.cc | 2 ++ webkit/glue/webworkerclient_impl.h | 1 + webkit/port/bindings/v8/V8WorkerContextCustom.cpp | 1 + 6 files changed, 8 insertions(+) (limited to 'webkit') diff --git a/webkit/glue/webworker.h b/webkit/glue/webworker.h index 302fa24..2aafc8a 100644 --- a/webkit/glue/webworker.h +++ b/webkit/glue/webworker.h @@ -22,6 +22,7 @@ class WebWorker { virtual void StartWorkerContext(const GURL& script_url, const string16& user_agent, + const string16& encoding, const string16& source_code) = 0; virtual void TerminateWorkerContext() = 0; virtual void PostMessageToWorkerContext(const string16& message) = 0; diff --git a/webkit/glue/webworker_impl.cc b/webkit/glue/webworker_impl.cc index 4b4ae94..310d005 100644 --- a/webkit/glue/webworker_impl.cc +++ b/webkit/glue/webworker_impl.cc @@ -48,10 +48,12 @@ void WebWorkerImpl::PostMessageToWorkerContextTask( void WebWorkerImpl::StartWorkerContext(const GURL& script_url, const string16& user_agent, + const string16& encoding, const string16& source_code) { worker_thread_ = WebCore::WorkerThread::create( webkit_glue::GURLToKURL(script_url), webkit_glue::String16ToString(user_agent), + webkit_glue::String16ToString(encoding), webkit_glue::String16ToString(source_code), this); diff --git a/webkit/glue/webworker_impl.h b/webkit/glue/webworker_impl.h index 4af1f64..ded7e8b 100644 --- a/webkit/glue/webworker_impl.h +++ b/webkit/glue/webworker_impl.h @@ -49,6 +49,7 @@ class WebWorkerImpl: public WebCore::WorkerObjectProxy, // WebWorker implementation. void StartWorkerContext(const GURL& script_url, const string16& user_agent, + const string16& encoding, const string16& source_code); void TerminateWorkerContext(); void PostMessageToWorkerContext(const string16& message); diff --git a/webkit/glue/webworkerclient_impl.cc b/webkit/glue/webworkerclient_impl.cc index 11ccfca..5ca416d 100644 --- a/webkit/glue/webworkerclient_impl.cc +++ b/webkit/glue/webworkerclient_impl.cc @@ -73,9 +73,11 @@ void WebWorkerClientImpl::set_webworker(WebWorker* webworker) { void WebWorkerClientImpl::startWorkerContext( const WebCore::KURL& scriptURL, const WebCore::String& userAgent, + const WebCore::String& encoding, const WebCore::String& sourceCode) { webworker_->StartWorkerContext(webkit_glue::KURLToGURL(scriptURL), webkit_glue::StringToString16(userAgent), + webkit_glue::StringToString16(encoding), webkit_glue::StringToString16(sourceCode)); } diff --git a/webkit/glue/webworkerclient_impl.h b/webkit/glue/webworkerclient_impl.h index 4c8277c..6603bdc 100644 --- a/webkit/glue/webworkerclient_impl.h +++ b/webkit/glue/webworkerclient_impl.h @@ -33,6 +33,7 @@ class WebWorkerClientImpl : public WebCore::WorkerContextProxy, // WebCore::WorkerContextProxy implementation void startWorkerContext(const WebCore::KURL& scriptURL, const WebCore::String& userAgent, + const WebCore::String& encoding, const WebCore::String& sourceCode); void terminateWorkerContext(); void postMessageToWorkerContext(const WebCore::String& message); diff --git a/webkit/port/bindings/v8/V8WorkerContextCustom.cpp b/webkit/port/bindings/v8/V8WorkerContextCustom.cpp index 27f6c8b..3134ba2 100644 --- a/webkit/port/bindings/v8/V8WorkerContextCustom.cpp +++ b/webkit/port/bindings/v8/V8WorkerContextCustom.cpp @@ -42,6 +42,7 @@ #include "ExceptionCode.h" #include "MessagePort.h" +#include "NotImplemented.h" #include "WorkerContext.h" namespace WebCore { -- cgit v1.1