Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(570)

Side by Side Diff: chrome/worker/nativewebworker_impl.h

Issue 266036: Fix another race condition on worker process shutdown that results in use-aft... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/renderer/webworker_proxy.cc ('k') | chrome/worker/nativewebworker_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_WORKER_NATIVEWORKER_H_ 5 #ifndef CHROME_WORKER_NATIVEWORKER_H_
6 #define CHROME_WORKER_NATIVEWORKER_H_ 6 #define CHROME_WORKER_NATIVEWORKER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "webkit/api/public/WebWorker.h" 9 #include "webkit/api/public/WebWorker.h"
10 #include "webkit/api/public/WebWorkerClient.h" 10 #include "webkit/api/public/WebWorkerClient.h"
(...skipping 13 matching lines...) Expand all
24 24
25 // WebWorker implementation. 25 // WebWorker implementation.
26 void startWorkerContext(const WebKit::WebURL& script_url, 26 void startWorkerContext(const WebKit::WebURL& script_url,
27 const WebKit::WebString& user_agent, 27 const WebKit::WebString& user_agent,
28 const WebKit::WebString& source_code); 28 const WebKit::WebString& source_code);
29 void terminateWorkerContext(); 29 void terminateWorkerContext();
30 void postMessageToWorkerContext( 30 void postMessageToWorkerContext(
31 const WebKit::WebString& message, 31 const WebKit::WebString& message,
32 const WebKit::WebMessagePortChannelArray& channels); 32 const WebKit::WebMessagePortChannelArray& channels);
33 void workerObjectDestroyed(); 33 void workerObjectDestroyed();
34 void clientDestroyed();
34 35
35 private: 36 private:
36 WebKit::WebWorkerClient* client_; 37 WebKit::WebWorkerClient* client_;
37 struct NaClApp* nap_; 38 struct NaClApp* nap_;
38 struct NaClSrpcChannel* channel_; 39 struct NaClSrpcChannel* channel_;
39 NativeWebWorkerListenerThread* upcall_thread_; 40 NativeWebWorkerListenerThread* upcall_thread_;
40 struct NaClDesc* descs_[2]; 41 struct NaClDesc* descs_[2];
41 42
42 DISALLOW_COPY_AND_ASSIGN(NativeWebWorkerImpl); 43 DISALLOW_COPY_AND_ASSIGN(NativeWebWorkerImpl);
43 }; 44 };
44 45
45 #endif // CHROME_WORKER_NATIVEWEBWORKER_H_ 46 #endif // CHROME_WORKER_NATIVEWEBWORKER_H_
OLDNEW
« no previous file with comments | « chrome/renderer/webworker_proxy.cc ('k') | chrome/worker/nativewebworker_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698