bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

When running in single-process mode wait for the render thread to stop before shutting down the context (issue #570).

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1078 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-02-02 00:21:59 +00:00
parent 9d07fba418
commit bccce6258f
3 changed files with 99 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libcef/renderer/content_renderer_client.h
View File

@@ -16,6 +16,7 @@
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
#include "base/sequenced_task_runner.h"
#include "content/public/renderer/content_renderer_client.h"
@@ -23,7 +24,8 @@ class CefRenderProcessObserver;
class CefWebWorkerScriptObserver;
struct Cef_CrossOriginWhiteListEntry_Params;
class CefContentRendererClient : public content::ContentRendererClient {
class CefContentRendererClient : public content::ContentRendererClient,
public MessageLoop::DestructionObserver {
public:
CefContentRendererClient();
virtual ~CefContentRendererClient();
@@ -72,6 +74,10 @@ class CefContentRendererClient : public content::ContentRendererClient {
// Remove the task runner associated with the specified worker ID.
void RemoveWorkerTaskRunner(int worker_id);
// Perform cleanup work that needs to occur before shutdown when running in
// single-process mode. Blocks until cleanup is complete.
void RunSingleProcessCleanup();
private:
// ContentRendererClient implementation.
virtual void RenderThreadStarted() OVERRIDE;
@@ -89,6 +95,12 @@ class CefContentRendererClient : public content::ContentRendererClient {
v8::Handle<v8::Context> context,
int world_id) OVERRIDE;
// MessageLoop::DestructionObserver implementation.
virtual void WillDestroyCurrentMessageLoop() OVERRIDE;
// Perform cleanup work for single-process mode.
void RunSingleProcessCleanupOnUIThread();
scoped_refptr<base::SequencedTaskRunner> render_task_runner_;
scoped_ptr<CefRenderProcessObserver> observer_;
scoped_ptr<CefWebWorkerScriptObserver> worker_script_observer_;
@@ -115,6 +127,11 @@ class CefContentRendererClient : public content::ContentRendererClient {
WorkerTaskRunnerMap;
WorkerTaskRunnerMap worker_task_runner_map_;
base::Lock worker_task_runner_lock_;
// Used in single-process mode to test when cleanup is complete.
// Access must be protected by |single_process_cleanup_lock_|.
bool single_process_cleanup_complete_;
base::Lock single_process_cleanup_lock_;
};
#endif // CEF_LIBCEF_RENDERER_CONTENT_RENDERER_CLIENT_H_