summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--chrome/worker/worker_webkitclient_impl.cc2
-rw-r--r--chrome/worker/worker_webkitclient_impl.h2
-rw-r--r--webkit/glue/webkitclient_impl.h2
-rw-r--r--webkit/glue/webworkerclient_impl.cc2
5 files changed, 5 insertions, 5 deletions
diff --git a/DEPS b/DEPS
index 93e0bd2..bd2f415 100644
--- a/DEPS
+++ b/DEPS
@@ -19,7 +19,7 @@ deps = {
"http://googletest.googlecode.com/svn/trunk@243",
"src/third_party/WebKit":
- "/trunk/deps/third_party/WebKit@15108",
+ "/trunk/deps/third_party/WebKit@15331",
"src/third_party/icu38":
"/trunk/deps/third_party/icu38@13472",
diff --git a/chrome/worker/worker_webkitclient_impl.cc b/chrome/worker/worker_webkitclient_impl.cc
index 36d2be8..b896a8a 100644
--- a/chrome/worker/worker_webkitclient_impl.cc
+++ b/chrome/worker/worker_webkitclient_impl.cc
@@ -58,7 +58,7 @@ WebKit::WebString WorkerWebKitClientImpl::defaultLocale() {
return WebKit::WebString();
}
-WebKit::WebWorker* WorkerWebKitClientImpl::CreateWebWorker(
+WebKit::WebWorker* WorkerWebKitClientImpl::createWorker(
WebKit::WebWorkerClient* client) {
return new WebWorkerProxy(client, WorkerThread::current(), 0);
}
diff --git a/chrome/worker/worker_webkitclient_impl.h b/chrome/worker/worker_webkitclient_impl.h
index 061544c..61d8824 100644
--- a/chrome/worker/worker_webkitclient_impl.h
+++ b/chrome/worker/worker_webkitclient_impl.h
@@ -23,7 +23,7 @@ class WorkerWebKitClientImpl : public webkit_glue::WebKitClientImpl {
const WebKit::WebURL& policy_url);
virtual void prefetchHostName(const WebKit::WebString&);
virtual WebKit::WebString defaultLocale();
- virtual WebKit::WebWorker* CreateWebWorker(WebKit::WebWorkerClient* client);
+ virtual WebKit::WebWorker* createWorker(WebKit::WebWorkerClient* client);
};
#endif // CHROME_WORKER_WORKER_WEBKIT_CLIENT_IMPL_H_
diff --git a/webkit/glue/webkitclient_impl.h b/webkit/glue/webkitclient_impl.h
index 0f809dc..1fb7c8e 100644
--- a/webkit/glue/webkitclient_impl.h
+++ b/webkit/glue/webkitclient_impl.h
@@ -33,7 +33,7 @@ class WebKitClientImpl : public WebKit::WebKitClient {
virtual void stopSharedTimer();
virtual void callOnMainThread(void (*func)());
virtual void suddenTerminationChanged(bool enabled) { }
- virtual WebKit::WebWorker* CreateWebWorker(WebKit::WebWorkerClient* client) {
+ virtual WebKit::WebWorker* createWorker(WebKit::WebWorkerClient* client) {
return NULL;
}
diff --git a/webkit/glue/webworkerclient_impl.cc b/webkit/glue/webworkerclient_impl.cc
index 05b7c55..dbd1a29 100644
--- a/webkit/glue/webworkerclient_impl.cc
+++ b/webkit/glue/webworkerclient_impl.cc
@@ -73,7 +73,7 @@ WebCore::WorkerContextProxy* WebCore::WorkerContextProxy::create(
frame_loader_client->webframe()->webview_impl()->delegate();
webworker = webview_delegate->CreateWebWorker(proxy);
} else {
- webworker = WebKit::webKitClient()->CreateWebWorker(proxy);
+ webworker = WebKit::webKitClient()->createWorker(proxy);
}
proxy->set_webworker(webworker);