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

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

Issue 2386913002: content: Remove gpu memory buffer manager from ChildThreadImpl. (Closed)
Patch Set: restore test Created 4 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
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 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 16 matching lines...) Expand all
27 #include "base/strings/string_util.h" 27 #include "base/strings/string_util.h"
28 #include "base/synchronization/condition_variable.h" 28 #include "base/synchronization/condition_variable.h"
29 #include "base/synchronization/lock.h" 29 #include "base/synchronization/lock.h"
30 #include "base/threading/thread_local.h" 30 #include "base/threading/thread_local.h"
31 #include "base/threading/thread_task_runner_handle.h" 31 #include "base/threading/thread_task_runner_handle.h"
32 #include "base/timer/elapsed_timer.h" 32 #include "base/timer/elapsed_timer.h"
33 #include "base/tracked_objects.h" 33 #include "base/tracked_objects.h"
34 #include "build/build_config.h" 34 #include "build/build_config.h"
35 #include "components/tracing/child/child_trace_message_filter.h" 35 #include "components/tracing/child/child_trace_message_filter.h"
36 #include "content/child/child_discardable_shared_memory_manager.h" 36 #include "content/child/child_discardable_shared_memory_manager.h"
37 #include "content/child/child_gpu_memory_buffer_manager.h"
38 #include "content/child/child_histogram_message_filter.h" 37 #include "content/child/child_histogram_message_filter.h"
39 #include "content/child/child_process.h" 38 #include "content/child/child_process.h"
40 #include "content/child/child_resource_message_filter.h" 39 #include "content/child/child_resource_message_filter.h"
41 #include "content/child/child_shared_bitmap_manager.h" 40 #include "content/child/child_shared_bitmap_manager.h"
42 #include "content/child/fileapi/file_system_dispatcher.h" 41 #include "content/child/fileapi/file_system_dispatcher.h"
43 #include "content/child/fileapi/webfilesystem_impl.h" 42 #include "content/child/fileapi/webfilesystem_impl.h"
44 #include "content/child/memory/child_memory_message_filter.h" 43 #include "content/child/memory/child_memory_message_filter.h"
45 #include "content/child/notifications/notification_dispatcher.h" 44 #include "content/child/notifications/notification_dispatcher.h"
46 #include "content/child/power_monitor_broadcast_source.h" 45 #include "content/child/power_monitor_broadcast_source.h"
47 #include "content/child/push_messaging/push_dispatcher.h" 46 #include "content/child/push_messaging/push_dispatcher.h"
(...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after
598 channel_connected_factory_->GetWeakPtr()), 597 channel_connected_factory_->GetWeakPtr()),
599 base::TimeDelta::FromSeconds(connection_timeout)); 598 base::TimeDelta::FromSeconds(connection_timeout));
600 599
601 #if defined(OS_ANDROID) 600 #if defined(OS_ANDROID)
602 g_quit_closure.Get().BindToMainThread(); 601 g_quit_closure.Get().BindToMainThread();
603 #endif 602 #endif
604 603
605 shared_bitmap_manager_.reset( 604 shared_bitmap_manager_.reset(
606 new ChildSharedBitmapManager(thread_safe_sender())); 605 new ChildSharedBitmapManager(thread_safe_sender()));
607 606
608 gpu_memory_buffer_manager_.reset(
609 new ChildGpuMemoryBufferManager(thread_safe_sender()));
610
611 discardable_shared_memory_manager_.reset( 607 discardable_shared_memory_manager_.reset(
612 new ChildDiscardableSharedMemoryManager(thread_safe_sender())); 608 new ChildDiscardableSharedMemoryManager(thread_safe_sender()));
613 } 609 }
614 610
615 ChildThreadImpl::~ChildThreadImpl() { 611 ChildThreadImpl::~ChildThreadImpl() {
616 #ifdef IPC_MESSAGE_LOG_ENABLED 612 #ifdef IPC_MESSAGE_LOG_ENABLED
617 IPC::Logging::GetInstance()->SetIPCSender(NULL); 613 IPC::Logging::GetInstance()->SetIPCSender(NULL);
618 #endif 614 #endif
619 615
620 IPC::AttachmentBroker* broker = IPC::AttachmentBroker::GetGlobal(); 616 IPC::AttachmentBroker* broker = IPC::AttachmentBroker::GetGlobal();
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
898 Listener* route = router_.GetRoute(routing_id); 894 Listener* route = router_.GetRoute(routing_id);
899 if (route) 895 if (route)
900 route->OnAssociatedInterfaceRequest(name, request.PassHandle()); 896 route->OnAssociatedInterfaceRequest(name, request.PassHandle());
901 } 897 }
902 898
903 bool ChildThreadImpl::IsInBrowserProcess() const { 899 bool ChildThreadImpl::IsInBrowserProcess() const {
904 return static_cast<bool>(browser_process_io_runner_); 900 return static_cast<bool>(browser_process_io_runner_);
905 } 901 }
906 902
907 } // namespace content 903 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698