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 1030 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1041 child_resource_message_filter()->SetMainThreadTaskRunner(resource_task_queue); | 1041 child_resource_message_filter()->SetMainThreadTaskRunner(resource_task_queue); |
1042 resource_dispatcher()->SetMainThreadTaskRunner(resource_task_queue); | 1042 resource_dispatcher()->SetMainThreadTaskRunner(resource_task_queue); |
1043 } | 1043 } |
1044 | 1044 |
1045 void RenderThreadImpl::EnsureWebKitInitialized() { | 1045 void RenderThreadImpl::EnsureWebKitInitialized() { |
1046 if (blink_platform_impl_) | 1046 if (blink_platform_impl_) |
1047 return; | 1047 return; |
1048 | 1048 |
1049 const base::CommandLine& command_line = | 1049 const base::CommandLine& command_line = |
1050 *base::CommandLine::ForCurrentProcess(); | 1050 *base::CommandLine::ForCurrentProcess(); |
| 1051 if (command_line.HasSwitch("crash-renderer")) |
| 1052 CHECK(false) << "crash-renderer specified"; |
1051 | 1053 |
1052 #ifdef ENABLE_VTUNE_JIT_INTERFACE | 1054 #ifdef ENABLE_VTUNE_JIT_INTERFACE |
1053 if (command_line.HasSwitch(switches::kEnableVtune)) | 1055 if (command_line.HasSwitch(switches::kEnableVtune)) |
1054 gin::Debug::SetJitCodeEventHandler(vTune::GetVtuneCodeEventHandler()); | 1056 gin::Debug::SetJitCodeEventHandler(vTune::GetVtuneCodeEventHandler()); |
1055 #endif | 1057 #endif |
1056 | 1058 |
1057 SetRuntimeFeaturesDefaultsAndUpdateFromArgs(command_line); | 1059 SetRuntimeFeaturesDefaultsAndUpdateFromArgs(command_line); |
1058 | 1060 |
1059 blink_platform_impl_.reset( | 1061 blink_platform_impl_.reset( |
1060 new RendererBlinkPlatformImpl(renderer_scheduler_.get())); | 1062 new RendererBlinkPlatformImpl(renderer_scheduler_.get())); |
(...skipping 882 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1943 } | 1945 } |
1944 | 1946 |
1945 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { | 1947 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { |
1946 size_t erased = | 1948 size_t erased = |
1947 RenderThreadImpl::current()->pending_render_frame_connects_.erase( | 1949 RenderThreadImpl::current()->pending_render_frame_connects_.erase( |
1948 routing_id_); | 1950 routing_id_); |
1949 DCHECK_EQ(1u, erased); | 1951 DCHECK_EQ(1u, erased); |
1950 } | 1952 } |
1951 | 1953 |
1952 } // namespace content | 1954 } // namespace content |
OLD | NEW |