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

Side by Side Diff: content/child/child_thread_impl.cc

Issue 1469843002: Remove dependency on allocator from 'content' targets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@unify_allocator1_2
Patch Set: Fix build Created 5 years 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "content/child/child_thread_impl.h" 5 #include "content/child/child_thread_impl.h"
6 6
7 #include <signal.h> 7 #include <signal.h>
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 489 matching lines...) Expand 10 before | Expand all | Expand 10 after
500 FROM_HERE, base::Bind(&ChildThreadImpl::EnsureConnected, 500 FROM_HERE, base::Bind(&ChildThreadImpl::EnsureConnected,
501 channel_connected_factory_.GetWeakPtr()), 501 channel_connected_factory_.GetWeakPtr()),
502 base::TimeDelta::FromSeconds(connection_timeout)); 502 base::TimeDelta::FromSeconds(connection_timeout));
503 503
504 #if defined(OS_ANDROID) 504 #if defined(OS_ANDROID)
505 g_quit_closure.Get().BindToMainThread(); 505 g_quit_closure.Get().BindToMainThread();
506 #endif 506 #endif
507 507
508 #if defined(TCMALLOC_TRACE_MEMORY_SUPPORTED) 508 #if defined(TCMALLOC_TRACE_MEMORY_SUPPORTED)
509 trace_memory_controller_.reset(new base::trace_event::TraceMemoryController( 509 trace_memory_controller_.reset(new base::trace_event::TraceMemoryController(
510 message_loop_->task_runner(), ::HeapProfilerWithPseudoStackStart, 510 message_loop_->task_runner()));
511 ::HeapProfilerStop, ::GetHeapProfile));
512 #endif 511 #endif
513 512
514 shared_bitmap_manager_.reset( 513 shared_bitmap_manager_.reset(
515 new ChildSharedBitmapManager(thread_safe_sender())); 514 new ChildSharedBitmapManager(thread_safe_sender()));
516 515
517 gpu_memory_buffer_manager_.reset( 516 gpu_memory_buffer_manager_.reset(
518 new ChildGpuMemoryBufferManager(thread_safe_sender())); 517 new ChildGpuMemoryBufferManager(thread_safe_sender()));
519 518
520 discardable_shared_memory_manager_.reset( 519 discardable_shared_memory_manager_.reset(
521 new ChildDiscardableSharedMemoryManager(thread_safe_sender())); 520 new ChildDiscardableSharedMemoryManager(thread_safe_sender()));
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
750 void ChildThreadImpl::EnsureConnected() { 749 void ChildThreadImpl::EnsureConnected() {
751 VLOG(0) << "ChildThreadImpl::EnsureConnected()"; 750 VLOG(0) << "ChildThreadImpl::EnsureConnected()";
752 base::Process::Current().Terminate(0, false); 751 base::Process::Current().Terminate(0, false);
753 } 752 }
754 753
755 bool ChildThreadImpl::IsInBrowserProcess() const { 754 bool ChildThreadImpl::IsInBrowserProcess() const {
756 return browser_process_io_runner_; 755 return browser_process_io_runner_;
757 } 756 }
758 757
759 } // namespace content 758 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698