diff options
| author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-09 04:23:26 +0000 |
|---|---|---|
| committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-09 04:23:26 +0000 |
| commit | 702690427d0185fe546ff21a01e501b77732166b (patch) | |
| tree | ced2e942d4fe058e16cfc5bebbcf4daf79316485 /chrome/renderer/websharedworker_proxy.h | |
| parent | 2456c5732fe85109c39dbdd3dbbb8262589a847e (diff) | |
| download | chromium_src-702690427d0185fe546ff21a01e501b77732166b.zip chromium_src-702690427d0185fe546ff21a01e501b77732166b.tar.gz chromium_src-702690427d0185fe546ff21a01e501b77732166b.tar.bz2 | |
Changed SharedWorkerScriptLoader and WebSharedWorkerProxy to stay alive until worker initialization is complete (they were being freed before the connect event was sent to the worker.
BUG=26233
TEST=none (will be enabled after a separate upstream patch is landed)
Review URL: http://codereview.chromium.org/372047
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31417 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/websharedworker_proxy.h')
| -rw-r--r-- | chrome/renderer/websharedworker_proxy.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/renderer/websharedworker_proxy.h b/chrome/renderer/websharedworker_proxy.h index b9ab065..6adcf08 100644 --- a/chrome/renderer/websharedworker_proxy.h +++ b/chrome/renderer/websharedworker_proxy.h @@ -26,7 +26,8 @@ class WebSharedWorkerProxy : public WebKit::WebSharedWorker, // Implementations of WebSharedWorker APIs virtual bool isStarted(); - virtual void connect(WebKit::WebMessagePortChannel* channel); + virtual void connect(WebKit::WebMessagePortChannel* channel, + ConnectListener* listener); virtual void startWorkerContext(const WebKit::WebURL& script_url, const WebKit::WebString& name, const WebKit::WebString& user_agent, @@ -40,6 +41,8 @@ class WebSharedWorkerProxy : public WebKit::WebSharedWorker, private: void OnWorkerCreated(); + ConnectListener* m_connectListener; + DISALLOW_COPY_AND_ASSIGN(WebSharedWorkerProxy); }; |