summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authormichaeln@chromium.org <michaeln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-05 21:54:21 +0000
committermichaeln@chromium.org <michaeln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-05 21:54:21 +0000
commitb7ab02638029b9dcb5f600a419acdf74fcfb0335 (patch)
treee27084029307a3844f1b586214106761dddefdfd /chrome
parent07505a88eac040e4280d27d86f27b2252c92d706 (diff)
downloadchromium_src-b7ab02638029b9dcb5f600a419acdf74fcfb0335.zip
chromium_src-b7ab02638029b9dcb5f600a419acdf74fcfb0335.tar.gz
chromium_src-b7ab02638029b9dcb5f600a419acdf74fcfb0335.tar.bz2
First step in adding a parameter to a method of WebKit::WebSharedWorker.
Adding an implementation of the soon to be defined pure virtual in the WebKitAPI, while leaving the soon to be deprecated method in place for the time being. I'll come back later to remove the deprecated method. BUG=39368 TEST=none Review URL: http://codereview.chromium.org/1954006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46503 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/renderer/websharedworker_proxy.cc3
-rw-r--r--chrome/renderer/websharedworker_proxy.h11
2 files changed, 12 insertions, 2 deletions
diff --git a/chrome/renderer/websharedworker_proxy.cc b/chrome/renderer/websharedworker_proxy.cc
index afb668f..13b02f6 100644
--- a/chrome/renderer/websharedworker_proxy.cc
+++ b/chrome/renderer/websharedworker_proxy.cc
@@ -30,7 +30,8 @@ void WebSharedWorkerProxy::startWorkerContext(
const WebKit::WebURL& script_url,
const WebKit::WebString& name,
const WebKit::WebString& user_agent,
- const WebKit::WebString& source_code) {
+ const WebKit::WebString& source_code,
+ long long script_resource_appcache_id) {
DCHECK(!isStarted());
CreateWorkerContext(script_url, true, name, user_agent, source_code,
pending_route_id_);
diff --git a/chrome/renderer/websharedworker_proxy.h b/chrome/renderer/websharedworker_proxy.h
index be88871..235f816 100644
--- a/chrome/renderer/websharedworker_proxy.h
+++ b/chrome/renderer/websharedworker_proxy.h
@@ -34,10 +34,19 @@ class WebSharedWorkerProxy : public WebKit::WebSharedWorker,
virtual void startWorkerContext(const WebKit::WebURL& script_url,
const WebKit::WebString& name,
const WebKit::WebString& user_agent,
- const WebKit::WebString& source_code);
+ const WebKit::WebString& source_code,
+ long long script_resource_appcache_id);
virtual void terminateWorkerContext();
virtual void clientDestroyed();
+ // TODO(michaeln): Remove after the webkit API changes have rolled into view.
+ virtual void startWorkerContext(const WebKit::WebURL& script_url,
+ const WebKit::WebString& name,
+ const WebKit::WebString& user_agent,
+ const WebKit::WebString& source_code) {
+ startWorkerContext(script_url, name, user_agent, source_code, 0);
+ }
+
// IPC::Channel::Listener implementation.
void OnMessageReceived(const IPC::Message& message);