OLD | NEW |
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.h" | 5 #include "content/child/child_thread.h" |
6 | 6 |
7 #include <signal.h> | 7 #include <signal.h> |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 27 matching lines...) Expand all Loading... |
38 #include "content/child/service_worker/service_worker_message_filter.h" | 38 #include "content/child/service_worker/service_worker_message_filter.h" |
39 #include "content/child/socket_stream_dispatcher.h" | 39 #include "content/child/socket_stream_dispatcher.h" |
40 #include "content/child/thread_safe_sender.h" | 40 #include "content/child/thread_safe_sender.h" |
41 #include "content/child/websocket_dispatcher.h" | 41 #include "content/child/websocket_dispatcher.h" |
42 #include "content/common/child_process_messages.h" | 42 #include "content/common/child_process_messages.h" |
43 #include "content/public/common/content_switches.h" | 43 #include "content/public/common/content_switches.h" |
44 #include "ipc/ipc_logging.h" | 44 #include "ipc/ipc_logging.h" |
45 #include "ipc/ipc_switches.h" | 45 #include "ipc/ipc_switches.h" |
46 #include "ipc/ipc_sync_channel.h" | 46 #include "ipc/ipc_sync_channel.h" |
47 #include "ipc/ipc_sync_message_filter.h" | 47 #include "ipc/ipc_sync_message_filter.h" |
48 #include "webkit/child/resource_loader_bridge.h" | |
49 | 48 |
50 #if defined(OS_WIN) | 49 #if defined(OS_WIN) |
51 #include "content/common/handle_enumerator_win.h" | 50 #include "content/common/handle_enumerator_win.h" |
52 #endif | 51 #endif |
53 | 52 |
54 #if defined(TCMALLOC_TRACE_MEMORY_SUPPORTED) | 53 #if defined(TCMALLOC_TRACE_MEMORY_SUPPORTED) |
55 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h" | 54 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h" |
56 #endif | 55 #endif |
57 | 56 |
58 using tracked_objects::ThreadData; | 57 using tracked_objects::ThreadData; |
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
367 } | 366 } |
368 | 367 |
369 return channel_->Send(msg); | 368 return channel_->Send(msg); |
370 } | 369 } |
371 | 370 |
372 MessageRouter* ChildThread::GetRouter() { | 371 MessageRouter* ChildThread::GetRouter() { |
373 DCHECK(base::MessageLoop::current() == message_loop()); | 372 DCHECK(base::MessageLoop::current() == message_loop()); |
374 return &router_; | 373 return &router_; |
375 } | 374 } |
376 | 375 |
377 webkit_glue::ResourceLoaderBridge* ChildThread::CreateBridge( | |
378 const RequestInfo& request_info) { | |
379 return resource_dispatcher()->CreateBridge(request_info); | |
380 } | |
381 | |
382 base::SharedMemory* ChildThread::AllocateSharedMemory(size_t buf_size) { | 376 base::SharedMemory* ChildThread::AllocateSharedMemory(size_t buf_size) { |
383 return AllocateSharedMemory(buf_size, this); | 377 return AllocateSharedMemory(buf_size, this); |
384 } | 378 } |
385 | 379 |
386 // static | 380 // static |
387 base::SharedMemory* ChildThread::AllocateSharedMemory( | 381 base::SharedMemory* ChildThread::AllocateSharedMemory( |
388 size_t buf_size, | 382 size_t buf_size, |
389 IPC::Sender* sender) { | 383 IPC::Sender* sender) { |
390 scoped_ptr<base::SharedMemory> shared_buf; | 384 scoped_ptr<base::SharedMemory> shared_buf; |
391 #if defined(OS_WIN) | 385 #if defined(OS_WIN) |
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
546 // inflight that would addref it. | 540 // inflight that would addref it. |
547 Send(new ChildProcessHostMsg_ShutdownRequest); | 541 Send(new ChildProcessHostMsg_ShutdownRequest); |
548 } | 542 } |
549 | 543 |
550 void ChildThread::EnsureConnected() { | 544 void ChildThread::EnsureConnected() { |
551 VLOG(0) << "ChildThread::EnsureConnected()"; | 545 VLOG(0) << "ChildThread::EnsureConnected()"; |
552 base::KillProcess(base::GetCurrentProcessHandle(), 0, false); | 546 base::KillProcess(base::GetCurrentProcessHandle(), 0, false); |
553 } | 547 } |
554 | 548 |
555 } // namespace content | 549 } // namespace content |
OLD | NEW |