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 1343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1354 params.main_frame_routing_id, | 1354 params.main_frame_routing_id, |
1355 params.surface_id, | 1355 params.surface_id, |
1356 params.session_storage_namespace_id, | 1356 params.session_storage_namespace_id, |
1357 params.frame_name, | 1357 params.frame_name, |
1358 false, | 1358 false, |
1359 params.swapped_out, | 1359 params.swapped_out, |
1360 params.proxy_routing_id, | 1360 params.proxy_routing_id, |
1361 params.hidden, | 1361 params.hidden, |
1362 params.never_visible, | 1362 params.never_visible, |
1363 params.next_page_id, | 1363 params.next_page_id, |
1364 params.screen_info); | 1364 params.initial_size, |
| 1365 params.enable_auto_resize, |
| 1366 params.min_size, |
| 1367 params.max_size); |
1365 } | 1368 } |
1366 | 1369 |
1367 GpuChannelHost* RenderThreadImpl::EstablishGpuChannelSync( | 1370 GpuChannelHost* RenderThreadImpl::EstablishGpuChannelSync( |
1368 CauseForGpuLaunch cause_for_gpu_launch) { | 1371 CauseForGpuLaunch cause_for_gpu_launch) { |
1369 TRACE_EVENT0("gpu", "RenderThreadImpl::EstablishGpuChannelSync"); | 1372 TRACE_EVENT0("gpu", "RenderThreadImpl::EstablishGpuChannelSync"); |
1370 | 1373 |
1371 if (gpu_channel_.get()) { | 1374 if (gpu_channel_.get()) { |
1372 // Do nothing if we already have a GPU channel or are already | 1375 // Do nothing if we already have a GPU channel or are already |
1373 // establishing one. | 1376 // establishing one. |
1374 if (!gpu_channel_->IsLost()) | 1377 if (!gpu_channel_->IsLost()) |
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1609 hidden_widget_count_--; | 1612 hidden_widget_count_--; |
1610 | 1613 |
1611 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { | 1614 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { |
1612 return; | 1615 return; |
1613 } | 1616 } |
1614 | 1617 |
1615 ScheduleIdleHandler(kLongIdleHandlerDelayMs); | 1618 ScheduleIdleHandler(kLongIdleHandlerDelayMs); |
1616 } | 1619 } |
1617 | 1620 |
1618 } // namespace content | 1621 } // namespace content |
OLD | NEW |