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 1196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1207 return NULL; | 1207 return NULL; |
1208 } | 1208 } |
1209 | 1209 |
1210 GetContentClient()->SetGpuInfo(gpu_info); | 1210 GetContentClient()->SetGpuInfo(gpu_info); |
1211 | 1211 |
1212 // Cache some variables that are needed on the compositor thread for our | 1212 // Cache some variables that are needed on the compositor thread for our |
1213 // implementation of GpuChannelHostFactory. | 1213 // implementation of GpuChannelHostFactory. |
1214 io_message_loop_proxy_ = ChildProcess::current()->io_message_loop_proxy(); | 1214 io_message_loop_proxy_ = ChildProcess::current()->io_message_loop_proxy(); |
1215 shutdown_event_ = ChildProcess::current()->GetShutDownEvent(); | 1215 shutdown_event_ = ChildProcess::current()->GetShutDownEvent(); |
1216 | 1216 |
1217 gpu_channel_ = GpuChannelHost::Create( | 1217 gpu_channel_ = GpuChannelHost::Create(this, gpu_info, channel_handle); |
1218 this, 0, gpu_info, channel_handle); | |
1219 return gpu_channel_.get(); | 1218 return gpu_channel_.get(); |
1220 } | 1219 } |
1221 | 1220 |
1222 blink::WebMediaStreamCenter* RenderThreadImpl::CreateMediaStreamCenter( | 1221 blink::WebMediaStreamCenter* RenderThreadImpl::CreateMediaStreamCenter( |
1223 blink::WebMediaStreamCenterClient* client) { | 1222 blink::WebMediaStreamCenterClient* client) { |
1224 #if defined(OS_ANDROID) | 1223 #if defined(OS_ANDROID) |
1225 if (CommandLine::ForCurrentProcess()->HasSwitch( | 1224 if (CommandLine::ForCurrentProcess()->HasSwitch( |
1226 switches::kDisableWebRTC)) | 1225 switches::kDisableWebRTC)) |
1227 return NULL; | 1226 return NULL; |
1228 #endif | 1227 #endif |
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1402 hidden_widget_count_--; | 1401 hidden_widget_count_--; |
1403 | 1402 |
1404 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { | 1403 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { |
1405 return; | 1404 return; |
1406 } | 1405 } |
1407 | 1406 |
1408 ScheduleIdleHandler(kLongIdleHandlerDelayMs); | 1407 ScheduleIdleHandler(kLongIdleHandlerDelayMs); |
1409 } | 1408 } |
1410 | 1409 |
1411 } // namespace content | 1410 } // namespace content |
OLD | NEW |