Skip to content
This repository has been archived by the owner on Apr 3, 2020. It is now read-only.

Create GPU process object before creating GPU thread in single process #40

Merged
merged 1 commit into from
Aug 13, 2013
Merged

Create GPU process object before creating GPU thread in single process #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 5 additions & 13 deletions content/browser/gpu/gpu_process_host.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,8 +285,7 @@ class GpuMainThread : public base::Thread {
explicit GpuMainThread(const std::string& channel_id)
: base::Thread("Chrome_InProcGpuThread"),
channel_id_(channel_id),
gpu_process_(NULL),
child_thread_(NULL) {
gpu_process_(NULL) {
}

virtual ~GpuMainThread() {
Expand All @@ -295,27 +294,20 @@ class GpuMainThread : public base::Thread {

protected:
virtual void Init() OVERRIDE {
if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess)) {
child_thread_ = new GpuChildThread(channel_id_);
} else {
gpu_process_ = new GpuProcess();
// The process object takes ownership of the thread object, so do not
// save and delete the pointer.
gpu_process_->set_main_thread(new GpuChildThread(channel_id_));
}
gpu_process_ = new GpuProcess();
// The process object takes ownership of the thread object, so do not
// save and delete the pointer.
gpu_process_->set_main_thread(new GpuChildThread(channel_id_));
}

virtual void CleanUp() OVERRIDE {
delete gpu_process_;
if (child_thread_)
delete child_thread_;
}

private:
std::string channel_id_;
// Deleted in CleanUp() on the gpu thread, so don't use smart pointers.
GpuProcess* gpu_process_;
GpuChildThread* child_thread_;

DISALLOW_COPY_AND_ASSIGN(GpuMainThread);
};
Expand Down
3 changes: 0 additions & 3 deletions content/common/child_process.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ ChildProcess::ChildProcess()
: ref_count_(0),
shutdown_event_(true, false),
io_thread_("Chrome_ChildIOThread") {
DCHECK(!child_process_);
child_process_ = this;

base::StatisticsRecorder::Initialize();
Expand All @@ -61,8 +60,6 @@ ChildProcess::ChildProcess()
}

ChildProcess::~ChildProcess() {
DCHECK(child_process_ == this);

// Signal this event before destroying the child process. That way all
// background threads can cleanup.
// For example, in the renderer the RenderThread instances will be able to
Expand Down