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

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

Issue 2552913003: Revert of Replacing allocate bitmap IPC messages with a new Mojo interface. (Closed)
Patch Set: Created 4 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') | content/common/child_process_messages.h » ('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 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 18 matching lines...) Expand all
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_histogram_message_filter.h" 36 #include "content/child/child_histogram_message_filter.h"
37 #include "content/child/child_process.h" 37 #include "content/child/child_process.h"
38 #include "content/child/child_resource_message_filter.h" 38 #include "content/child/child_resource_message_filter.h"
39 #include "content/child/child_shared_bitmap_manager.h"
39 #include "content/child/fileapi/file_system_dispatcher.h" 40 #include "content/child/fileapi/file_system_dispatcher.h"
40 #include "content/child/fileapi/webfilesystem_impl.h" 41 #include "content/child/fileapi/webfilesystem_impl.h"
41 #include "content/child/memory/child_memory_message_filter.h" 42 #include "content/child/memory/child_memory_message_filter.h"
42 #include "content/child/notifications/notification_dispatcher.h" 43 #include "content/child/notifications/notification_dispatcher.h"
43 #include "content/child/push_messaging/push_dispatcher.h" 44 #include "content/child/push_messaging/push_dispatcher.h"
44 #include "content/child/quota_dispatcher.h" 45 #include "content/child/quota_dispatcher.h"
45 #include "content/child/quota_message_filter.h" 46 #include "content/child/quota_message_filter.h"
46 #include "content/child/resource_dispatcher.h" 47 #include "content/child/resource_dispatcher.h"
47 #include "content/child/service_worker/service_worker_message_filter.h" 48 #include "content/child/service_worker/service_worker_message_filter.h"
48 #include "content/child/thread_safe_sender.h" 49 #include "content/child/thread_safe_sender.h"
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
553 } 554 }
554 555
555 message_loop_->task_runner()->PostDelayedTask( 556 message_loop_->task_runner()->PostDelayedTask(
556 FROM_HERE, base::Bind(&ChildThreadImpl::EnsureConnected, 557 FROM_HERE, base::Bind(&ChildThreadImpl::EnsureConnected,
557 channel_connected_factory_->GetWeakPtr()), 558 channel_connected_factory_->GetWeakPtr()),
558 base::TimeDelta::FromSeconds(connection_timeout)); 559 base::TimeDelta::FromSeconds(connection_timeout));
559 560
560 #if defined(OS_ANDROID) 561 #if defined(OS_ANDROID)
561 g_quit_closure.Get().BindToMainThread(); 562 g_quit_closure.Get().BindToMainThread();
562 #endif 563 #endif
564
565 shared_bitmap_manager_.reset(
566 new ChildSharedBitmapManager(thread_safe_sender()));
563 } 567 }
564 568
565 ChildThreadImpl::~ChildThreadImpl() { 569 ChildThreadImpl::~ChildThreadImpl() {
566 #ifdef IPC_MESSAGE_LOG_ENABLED 570 #ifdef IPC_MESSAGE_LOG_ENABLED
567 IPC::Logging::GetInstance()->SetIPCSender(NULL); 571 IPC::Logging::GetInstance()->SetIPCSender(NULL);
568 #endif 572 #endif
569 573
570 channel_->RemoveFilter(histogram_message_filter_.get()); 574 channel_->RemoveFilter(histogram_message_filter_.get());
571 channel_->RemoveFilter(sync_message_filter_.get()); 575 channel_->RemoveFilter(sync_message_filter_.get());
572 576
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
872 connected_to_browser_ = true; 876 connected_to_browser_ = true;
873 child_info_ = local_info; 877 child_info_ = local_info;
874 browser_info_ = remote_info; 878 browser_info_ = remote_info;
875 } 879 }
876 880
877 bool ChildThreadImpl::IsInBrowserProcess() const { 881 bool ChildThreadImpl::IsInBrowserProcess() const {
878 return static_cast<bool>(browser_process_io_runner_); 882 return static_cast<bool>(browser_process_io_runner_);
879 } 883 }
880 884
881 } // namespace content 885 } // namespace content
OLDNEW
« no previous file with comments | « content/child/child_thread_impl.h ('k') | content/common/child_process_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698