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

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

Issue 1468883003: Remove memory category from chrome://tracing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@format-trace-event
Patch Set: Rebase 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
« no previous file with comments | « content/child/child_thread_impl.h ('k') | tools/gn/bootstrap/bootstrap.py » ('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) 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 492 matching lines...) Expand 10 before | Expand all | Expand 10 after
503 503
504 message_loop_->task_runner()->PostDelayedTask( 504 message_loop_->task_runner()->PostDelayedTask(
505 FROM_HERE, base::Bind(&ChildThreadImpl::EnsureConnected, 505 FROM_HERE, base::Bind(&ChildThreadImpl::EnsureConnected,
506 channel_connected_factory_.GetWeakPtr()), 506 channel_connected_factory_.GetWeakPtr()),
507 base::TimeDelta::FromSeconds(connection_timeout)); 507 base::TimeDelta::FromSeconds(connection_timeout));
508 508
509 #if defined(OS_ANDROID) 509 #if defined(OS_ANDROID)
510 g_quit_closure.Get().BindToMainThread(); 510 g_quit_closure.Get().BindToMainThread();
511 #endif 511 #endif
512 512
513 #if defined(TCMALLOC_TRACE_MEMORY_SUPPORTED)
514 trace_memory_controller_.reset(new base::trace_event::TraceMemoryController(
515 message_loop_->task_runner(), ::HeapProfilerWithPseudoStackStart,
516 ::HeapProfilerStop, ::GetHeapProfile));
517 #endif
518
519 shared_bitmap_manager_.reset( 513 shared_bitmap_manager_.reset(
520 new ChildSharedBitmapManager(thread_safe_sender())); 514 new ChildSharedBitmapManager(thread_safe_sender()));
521 515
522 gpu_memory_buffer_manager_.reset( 516 gpu_memory_buffer_manager_.reset(
523 new ChildGpuMemoryBufferManager(thread_safe_sender())); 517 new ChildGpuMemoryBufferManager(thread_safe_sender()));
524 518
525 discardable_shared_memory_manager_.reset( 519 discardable_shared_memory_manager_.reset(
526 new ChildDiscardableSharedMemoryManager(thread_safe_sender())); 520 new ChildDiscardableSharedMemoryManager(thread_safe_sender()));
527 } 521 }
528 522
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
770 void ChildThreadImpl::EnsureConnected() { 764 void ChildThreadImpl::EnsureConnected() {
771 VLOG(0) << "ChildThreadImpl::EnsureConnected()"; 765 VLOG(0) << "ChildThreadImpl::EnsureConnected()";
772 base::Process::Current().Terminate(0, false); 766 base::Process::Current().Terminate(0, false);
773 } 767 }
774 768
775 bool ChildThreadImpl::IsInBrowserProcess() const { 769 bool ChildThreadImpl::IsInBrowserProcess() const {
776 return browser_process_io_runner_; 770 return browser_process_io_runner_;
777 } 771 }
778 772
779 } // namespace content 773 } // namespace content
OLDNEW
« no previous file with comments | « content/child/child_thread_impl.h ('k') | tools/gn/bootstrap/bootstrap.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698