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 1318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1329 params.main_frame_routing_id, | 1329 params.main_frame_routing_id, |
1330 params.surface_id, | 1330 params.surface_id, |
1331 params.session_storage_namespace_id, | 1331 params.session_storage_namespace_id, |
1332 params.frame_name, | 1332 params.frame_name, |
1333 false, | 1333 false, |
1334 params.swapped_out, | 1334 params.swapped_out, |
1335 params.proxy_routing_id, | 1335 params.proxy_routing_id, |
1336 params.hidden, | 1336 params.hidden, |
1337 params.never_visible, | 1337 params.never_visible, |
1338 params.next_page_id, | 1338 params.next_page_id, |
1339 params.screen_info); | 1339 params.initial_size.screen_info, |
| 1340 ¶ms.initial_size); |
1340 } | 1341 } |
1341 | 1342 |
1342 GpuChannelHost* RenderThreadImpl::EstablishGpuChannelSync( | 1343 GpuChannelHost* RenderThreadImpl::EstablishGpuChannelSync( |
1343 CauseForGpuLaunch cause_for_gpu_launch) { | 1344 CauseForGpuLaunch cause_for_gpu_launch) { |
1344 TRACE_EVENT0("gpu", "RenderThreadImpl::EstablishGpuChannelSync"); | 1345 TRACE_EVENT0("gpu", "RenderThreadImpl::EstablishGpuChannelSync"); |
1345 | 1346 |
1346 if (gpu_channel_.get()) { | 1347 if (gpu_channel_.get()) { |
1347 // Do nothing if we already have a GPU channel or are already | 1348 // Do nothing if we already have a GPU channel or are already |
1348 // establishing one. | 1349 // establishing one. |
1349 if (!gpu_channel_->IsLost()) | 1350 if (!gpu_channel_->IsLost()) |
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1584 hidden_widget_count_--; | 1585 hidden_widget_count_--; |
1585 | 1586 |
1586 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { | 1587 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { |
1587 return; | 1588 return; |
1588 } | 1589 } |
1589 | 1590 |
1590 ScheduleIdleHandler(kLongIdleHandlerDelayMs); | 1591 ScheduleIdleHandler(kLongIdleHandlerDelayMs); |
1591 } | 1592 } |
1592 | 1593 |
1593 } // namespace content | 1594 } // namespace content |
OLD | NEW |