summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-28 19:46:19 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-28 19:46:19 +0000
commit7c2a34b9ef9eab5c58518d43e32f68cdf6e2289a (patch)
tree5cbbe9303648e61abcbf74beafb4c0fa2769a44f /webkit
parentf6a5698b887a63d74575cedcda9e099e6373153f (diff)
downloadchromium_src-7c2a34b9ef9eab5c58518d43e32f68cdf6e2289a.zip
chromium_src-7c2a34b9ef9eab5c58518d43e32f68cdf6e2289a.tar.gz
chromium_src-7c2a34b9ef9eab5c58518d43e32f68cdf6e2289a.tar.bz2
Add a context parameter to callOnMainThread. The old form is going to be
deprecated. R=dimich BUG=42751 TEST=none Review URL: http://codereview.chromium.org/1794005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45845 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/webkitclient_impl.cc4
-rw-r--r--webkit/glue/webkitclient_impl.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc
index 6f6a43c..781eafc 100644
--- a/webkit/glue/webkitclient_impl.cc
+++ b/webkit/glue/webkitclient_impl.cc
@@ -336,6 +336,10 @@ void WebKitClientImpl::callOnMainThread(void (*func)()) {
main_loop_->PostTask(FROM_HERE, NewRunnableFunction(func));
}
+void WebKitClientImpl::callOnMainThread(void (*func)(void*), void* context) {
+ main_loop_->PostTask(FROM_HERE, NewRunnableFunction(func, context));
+}
+
base::PlatformFile WebKitClientImpl::databaseOpenFile(
const WebKit::WebString& vfs_file_name, int desired_flags,
base::PlatformFile* dir_handle) {
diff --git a/webkit/glue/webkitclient_impl.h b/webkit/glue/webkitclient_impl.h
index 93e14e3..0f3ee75 100644
--- a/webkit/glue/webkitclient_impl.h
+++ b/webkit/glue/webkitclient_impl.h
@@ -69,6 +69,7 @@ class WebKitClientImpl : public WebKit::WebKitClient {
virtual void setSharedTimerFireTime(double fireTime);
virtual void stopSharedTimer();
virtual void callOnMainThread(void (*func)());
+ virtual void callOnMainThread(void (*func)(void*), void* context);
void SuspendSharedTimer();
void ResumeSharedTimer();