Chromium Code Reviews| 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 <utility> | 10 #include <utility> |
| (...skipping 1212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1223 const base::CommandLine& command_line = | 1223 const base::CommandLine& command_line = |
| 1224 *base::CommandLine::ForCurrentProcess(); | 1224 *base::CommandLine::ForCurrentProcess(); |
| 1225 | 1225 |
| 1226 #ifdef ENABLE_VTUNE_JIT_INTERFACE | 1226 #ifdef ENABLE_VTUNE_JIT_INTERFACE |
| 1227 if (command_line.HasSwitch(switches::kEnableVtune)) | 1227 if (command_line.HasSwitch(switches::kEnableVtune)) |
| 1228 gin::Debug::SetJitCodeEventHandler(vTune::GetVtuneCodeEventHandler()); | 1228 gin::Debug::SetJitCodeEventHandler(vTune::GetVtuneCodeEventHandler()); |
| 1229 #endif | 1229 #endif |
| 1230 | 1230 |
| 1231 SetRuntimeFeaturesDefaultsAndUpdateFromArgs(command_line); | 1231 SetRuntimeFeaturesDefaultsAndUpdateFromArgs(command_line); |
| 1232 | 1232 |
| 1233 blink_platform_impl_.reset( | 1233 blink_platform_impl_.reset(new RendererBlinkPlatformImpl( |
| 1234 new RendererBlinkPlatformImpl(renderer_scheduler_.get())); | 1234 renderer_scheduler_.get(), |
| 1235 static_cast<ServiceRegistryImpl*>(service_registry())->GetWeakPtr())); | |
|
dcheng
2016/03/31 20:16:08
Unrelated to this patch, but maybe ChildThreadImpl
| |
| 1235 blink::initialize(blink_platform_impl_.get()); | 1236 blink::initialize(blink_platform_impl_.get()); |
| 1236 | 1237 |
| 1237 v8::Isolate* isolate = blink::mainThreadIsolate(); | 1238 v8::Isolate* isolate = blink::mainThreadIsolate(); |
| 1238 isolate->SetCreateHistogramFunction(CreateHistogram); | 1239 isolate->SetCreateHistogramFunction(CreateHistogram); |
| 1239 isolate->SetAddHistogramSampleFunction(AddHistogramSample); | 1240 isolate->SetAddHistogramSampleFunction(AddHistogramSample); |
| 1240 | 1241 |
| 1241 main_thread_compositor_task_runner_ = | 1242 main_thread_compositor_task_runner_ = |
| 1242 renderer_scheduler_->CompositorTaskRunner(); | 1243 renderer_scheduler_->CompositorTaskRunner(); |
| 1243 | 1244 |
| 1244 main_input_callback_.Reset( | 1245 main_input_callback_.Reset( |
| (...skipping 933 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2178 } | 2179 } |
| 2179 | 2180 |
| 2180 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { | 2181 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { |
| 2181 size_t erased = | 2182 size_t erased = |
| 2182 RenderThreadImpl::current()->pending_render_frame_connects_.erase( | 2183 RenderThreadImpl::current()->pending_render_frame_connects_.erase( |
| 2183 routing_id_); | 2184 routing_id_); |
| 2184 DCHECK_EQ(1u, erased); | 2185 DCHECK_EQ(1u, erased); |
| 2185 } | 2186 } |
| 2186 | 2187 |
| 2187 } // namespace content | 2188 } // namespace content |
| OLD | NEW |