summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--DEPS4
-rw-r--r--WEBKIT_MERGE_REVISION2
-rw-r--r--chrome/common/worker_messages_internal.h3
-rw-r--r--chrome/renderer/webworker_proxy.cc3
-rw-r--r--chrome/renderer/webworker_proxy.h1
-rw-r--r--webkit/glue/webworker.h1
-rw-r--r--webkit/glue/webworker_impl.cc2
-rw-r--r--webkit/glue/webworker_impl.h1
-rw-r--r--webkit/glue/webworkerclient_impl.cc2
-rw-r--r--webkit/glue/webworkerclient_impl.h1
-rw-r--r--webkit/port/bindings/v8/WorkerContextExecutionProxy.cpp2
-rw-r--r--webkit/port/bindings/v8/WorkerContextExecutionProxy.h2
12 files changed, 7 insertions, 17 deletions
diff --git a/DEPS b/DEPS
index efeb0c0..8d2ed41 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "41860",
+ "webkit_revision": "41906",
}
@@ -19,7 +19,7 @@ deps = {
"http://googletest.googlecode.com/svn/trunk@214",
"src/third_party/WebKit":
- "/trunk/deps/third_party/WebKit@12202",
+ "/trunk/deps/third_party/WebKit@12324",
"src/third_party/icu38":
"/trunk/deps/third_party/icu38@11496",
diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION
index 1b13b48..d52fd3f 100644
--- a/WEBKIT_MERGE_REVISION
+++ b/WEBKIT_MERGE_REVISION
@@ -1 +1 @@
-http://svn.webkit.org/repository/webkit/trunk@41860 \ No newline at end of file
+http://svn.webkit.org/repository/webkit/trunk@41906 \ No newline at end of file
diff --git a/chrome/common/worker_messages_internal.h b/chrome/common/worker_messages_internal.h
index 5d8449e..7691c79 100644
--- a/chrome/common/worker_messages_internal.h
+++ b/chrome/common/worker_messages_internal.h
@@ -29,10 +29,9 @@ IPC_END_MESSAGES(WorkerProcess)
// Worker messages
// These are messages sent from the renderer process to the worker process.
IPC_BEGIN_MESSAGES(Worker)
- IPC_MESSAGE_ROUTED4(WorkerMsg_StartWorkerContext,
+ IPC_MESSAGE_ROUTED3(WorkerMsg_StartWorkerContext,
GURL /* url */,
string16 /* user_agent */,
- string16 /* encoding */,
string16 /* source_code */)
IPC_MESSAGE_ROUTED0(WorkerMsg_TerminateWorkerContext)
diff --git a/chrome/renderer/webworker_proxy.cc b/chrome/renderer/webworker_proxy.cc
index 1dbce20..0da55f3 100644
--- a/chrome/renderer/webworker_proxy.cc
+++ b/chrome/renderer/webworker_proxy.cc
@@ -19,7 +19,6 @@ WebWorkerProxy::~WebWorkerProxy() {
void WebWorkerProxy::StartWorkerContext(
const GURL& script_url,
const string16& user_agent,
- const string16& encoding,
const string16& source_code) {
RenderThread::current()->Send(
new ViewHostMsg_CreateDedicatedWorker(script_url, &route_id_));
@@ -28,7 +27,7 @@ void WebWorkerProxy::StartWorkerContext(
RenderThread::current()->AddRoute(route_id_, this);
Send(new WorkerMsg_StartWorkerContext(
- route_id_, script_url, user_agent, encoding, source_code));
+ route_id_, script_url, user_agent, source_code));
for (size_t i = 0; i < queued_messages_.size(); ++i) {
queued_messages_[i]->set_routing_id(route_id_);
diff --git a/chrome/renderer/webworker_proxy.h b/chrome/renderer/webworker_proxy.h
index 5ab8af0..e068e8e 100644
--- a/chrome/renderer/webworker_proxy.h
+++ b/chrome/renderer/webworker_proxy.h
@@ -34,7 +34,6 @@ class WebWorkerProxy : public WebWorker,
// converted by glue code).
virtual void StartWorkerContext(const GURL& script_url,
const string16& user_agent,
- const string16& encoding,
const string16& source_code);
virtual void TerminateWorkerContext();
virtual void PostMessageToWorkerContext(const string16& message);
diff --git a/webkit/glue/webworker.h b/webkit/glue/webworker.h
index 2aafc8a..302fa24 100644
--- a/webkit/glue/webworker.h
+++ b/webkit/glue/webworker.h
@@ -22,7 +22,6 @@ 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 310d005..4b4ae94 100644
--- a/webkit/glue/webworker_impl.cc
+++ b/webkit/glue/webworker_impl.cc
@@ -48,12 +48,10 @@ 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 ded7e8b..4af1f64 100644
--- a/webkit/glue/webworker_impl.h
+++ b/webkit/glue/webworker_impl.h
@@ -49,7 +49,6 @@ 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 5ca416d..11ccfca 100644
--- a/webkit/glue/webworkerclient_impl.cc
+++ b/webkit/glue/webworkerclient_impl.cc
@@ -73,11 +73,9 @@ 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 6603bdc..4c8277c 100644
--- a/webkit/glue/webworkerclient_impl.h
+++ b/webkit/glue/webworkerclient_impl.h
@@ -33,7 +33,6 @@ 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/WorkerContextExecutionProxy.cpp b/webkit/port/bindings/v8/WorkerContextExecutionProxy.cpp
index b06ddb0..e0d3462 100644
--- a/webkit/port/bindings/v8/WorkerContextExecutionProxy.cpp
+++ b/webkit/port/bindings/v8/WorkerContextExecutionProxy.cpp
@@ -351,7 +351,7 @@ void WorkerContextExecutionProxy::RemoveEventListener(V8EventListener* listener)
}
}
-void WorkerContextExecutionProxy::TrackEvent(Event* event)
+void WorkerContextExecutionProxy::trackEvent(Event* event)
{
m_events.add(event);
}
diff --git a/webkit/port/bindings/v8/WorkerContextExecutionProxy.h b/webkit/port/bindings/v8/WorkerContextExecutionProxy.h
index 3297067..0da12ad 100644
--- a/webkit/port/bindings/v8/WorkerContextExecutionProxy.h
+++ b/webkit/port/bindings/v8/WorkerContextExecutionProxy.h
@@ -66,7 +66,7 @@ namespace WebCore {
// Track the event so that we can detach it from the JS wrapper when a worker
// terminates. This is needed because we need to be able to dispose these
// events and releases references to their event targets: WorkerContext.
- void TrackEvent(Event*);
+ void trackEvent(Event*);
// Evaluate a script file in the current execution environment.
v8::Local<v8::Value> evaluate(const String& str, const String& fileName, int baseLine);
generated by cgit v1.1 at 2024-12-26 17:32:53 +0000