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/renderer/render_thread_impl.h" | 5 #include "content/renderer/render_thread_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <limits> | 8 #include <limits> |
9 #include <map> | 9 #include <map> |
10 #include <vector> | 10 #include <vector> |
(...skipping 717 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
728 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(swappedout_scheme); | 728 WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(swappedout_scheme); |
729 WebSecurityPolicy::registerURLSchemeAsEmptyDocument(swappedout_scheme); | 729 WebSecurityPolicy::registerURLSchemeAsEmptyDocument(swappedout_scheme); |
730 } | 730 } |
731 | 731 |
732 void RenderThreadImpl::RecordUserMetrics(const std::string& action) { | 732 void RenderThreadImpl::RecordUserMetrics(const std::string& action) { |
733 Send(new ViewHostMsg_UserMetricsRecordAction(action)); | 733 Send(new ViewHostMsg_UserMetricsRecordAction(action)); |
734 } | 734 } |
735 | 735 |
736 base::SharedMemoryHandle RenderThreadImpl::HostAllocateSharedMemoryBuffer( | 736 base::SharedMemoryHandle RenderThreadImpl::HostAllocateSharedMemoryBuffer( |
737 uint32 buffer_size) { | 737 uint32 buffer_size) { |
738 base::SharedMemoryHandle mem_handle; | 738 base::SharedMemoryHandle mem_handle = base::SharedMemoryHandle(); |
jamesr
2012/10/12 19:33:57
can you just do mem_handle(); ?
scottmg
2012/10/12 19:35:56
That'd be a function prototype I think.
| |
739 Send(new ChildProcessHostMsg_SyncAllocateSharedMemory( | 739 Send(new ChildProcessHostMsg_SyncAllocateSharedMemory( |
740 buffer_size, &mem_handle)); | 740 buffer_size, &mem_handle)); |
741 return mem_handle; | 741 return mem_handle; |
742 } | 742 } |
743 | 743 |
744 void RenderThreadImpl::RegisterExtension(v8::Extension* extension) { | 744 void RenderThreadImpl::RegisterExtension(v8::Extension* extension) { |
745 WebScriptController::registerExtension(extension); | 745 WebScriptController::registerExtension(extension); |
746 } | 746 } |
747 | 747 |
748 void RenderThreadImpl::ScheduleIdleHandler(int64 initial_delay_ms) { | 748 void RenderThreadImpl::ScheduleIdleHandler(int64 initial_delay_ms) { |
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1149 | 1149 |
1150 scoped_refptr<base::MessageLoopProxy> | 1150 scoped_refptr<base::MessageLoopProxy> |
1151 RenderThreadImpl::GetFileThreadMessageLoopProxy() { | 1151 RenderThreadImpl::GetFileThreadMessageLoopProxy() { |
1152 DCHECK(message_loop() == MessageLoop::current()); | 1152 DCHECK(message_loop() == MessageLoop::current()); |
1153 if (!file_thread_.get()) { | 1153 if (!file_thread_.get()) { |
1154 file_thread_.reset(new base::Thread("Renderer::FILE")); | 1154 file_thread_.reset(new base::Thread("Renderer::FILE")); |
1155 file_thread_->Start(); | 1155 file_thread_->Start(); |
1156 } | 1156 } |
1157 return file_thread_->message_loop_proxy(); | 1157 return file_thread_->message_loop_proxy(); |
1158 } | 1158 } |
OLD | NEW |