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> |
11 | 11 |
12 #include "base/allocator/allocator_extension.h" | 12 #include "base/allocator/allocator_extension.h" |
13 #include "base/command_line.h" | 13 #include "base/command_line.h" |
14 #include "base/debug/trace_event.h" | 14 #include "base/debug/trace_event.h" |
15 #include "base/lazy_instance.h" | 15 #include "base/lazy_instance.h" |
16 #include "base/logging.h" | 16 #include "base/logging.h" |
17 #include "base/memory/discardable_memory.h" | |
17 #include "base/metrics/field_trial.h" | 18 #include "base/metrics/field_trial.h" |
18 #include "base/metrics/histogram.h" | 19 #include "base/metrics/histogram.h" |
19 #include "base/metrics/stats_table.h" | 20 #include "base/metrics/stats_table.h" |
20 #include "base/path_service.h" | 21 #include "base/path_service.h" |
21 #include "base/shared_memory.h" | 22 #include "base/shared_memory.h" |
22 #include "base/strings/string16.h" | 23 #include "base/strings/string16.h" |
23 #include "base/strings/string_number_conversions.h" // Temporary | 24 #include "base/strings/string_number_conversions.h" // Temporary |
24 #include "base/strings/utf_string_conversions.h" | 25 #include "base/strings/utf_string_conversions.h" |
25 #include "base/threading/thread_local.h" | 26 #include "base/threading/thread_local.h" |
26 #include "base/threading/thread_restrictions.h" | 27 #include "base/threading/thread_restrictions.h" |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
64 #include "content/renderer/media/audio_renderer_mixer_manager.h" | 65 #include "content/renderer/media/audio_renderer_mixer_manager.h" |
65 #include "content/renderer/media/media_stream_center.h" | 66 #include "content/renderer/media/media_stream_center.h" |
66 #include "content/renderer/media/media_stream_dependency_factory.h" | 67 #include "content/renderer/media/media_stream_dependency_factory.h" |
67 #include "content/renderer/media/peer_connection_tracker.h" | 68 #include "content/renderer/media/peer_connection_tracker.h" |
68 #include "content/renderer/media/video_capture_impl_manager.h" | 69 #include "content/renderer/media/video_capture_impl_manager.h" |
69 #include "content/renderer/media/video_capture_message_filter.h" | 70 #include "content/renderer/media/video_capture_message_filter.h" |
70 #include "content/renderer/memory_benchmarking_extension.h" | 71 #include "content/renderer/memory_benchmarking_extension.h" |
71 #include "content/renderer/p2p/socket_dispatcher.h" | 72 #include "content/renderer/p2p/socket_dispatcher.h" |
72 #include "content/renderer/plugin_channel_host.h" | 73 #include "content/renderer/plugin_channel_host.h" |
73 #include "content/renderer/render_process_impl.h" | 74 #include "content/renderer/render_process_impl.h" |
75 #include "content/renderer/render_process_visibility_manager.h" | |
74 #include "content/renderer/render_view_impl.h" | 76 #include "content/renderer/render_view_impl.h" |
75 #include "content/renderer/renderer_webkitplatformsupport_impl.h" | 77 #include "content/renderer/renderer_webkitplatformsupport_impl.h" |
76 #include "content/renderer/skia_benchmarking_extension.h" | 78 #include "content/renderer/skia_benchmarking_extension.h" |
77 #include "grit/content_resources.h" | 79 #include "grit/content_resources.h" |
78 #include "ipc/ipc_channel_handle.h" | 80 #include "ipc/ipc_channel_handle.h" |
79 #include "ipc/ipc_forwarding_message_filter.h" | 81 #include "ipc/ipc_forwarding_message_filter.h" |
80 #include "ipc/ipc_platform_file.h" | 82 #include "ipc/ipc_platform_file.h" |
81 #include "media/base/audio_hardware_config.h" | 83 #include "media/base/audio_hardware_config.h" |
82 #include "media/base/media.h" | 84 #include "media/base/media.h" |
83 #include "net/base/net_errors.h" | 85 #include "net/base/net_errors.h" |
(...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
590 | 592 |
591 void RenderThreadImpl::SetResourceDispatcherDelegate( | 593 void RenderThreadImpl::SetResourceDispatcherDelegate( |
592 ResourceDispatcherDelegate* delegate) { | 594 ResourceDispatcherDelegate* delegate) { |
593 resource_dispatcher()->set_delegate(delegate); | 595 resource_dispatcher()->set_delegate(delegate); |
594 } | 596 } |
595 | 597 |
596 void RenderThreadImpl::WidgetHidden() { | 598 void RenderThreadImpl::WidgetHidden() { |
597 DCHECK(hidden_widget_count_ < widget_count_); | 599 DCHECK(hidden_widget_count_ < widget_count_); |
598 hidden_widget_count_++; | 600 hidden_widget_count_++; |
599 | 601 |
602 #if !defined(DISCARDABLE_MEMORY_SUPPORTED_NATIVELY) | |
nduca
2013/06/20 19:56:45
i think we should always call the manager. there m
| |
603 RenderProcessVisibilityManager* manager = | |
604 RenderProcessVisibilityManager::GetInstance(); | |
605 manager->WidgetVisibilityChanged(false); | |
606 #endif | |
607 | |
600 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { | 608 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { |
601 return; | 609 return; |
602 } | 610 } |
603 | 611 |
604 if (widget_count_ && hidden_widget_count_ == widget_count_) | 612 if (widget_count_ && hidden_widget_count_ == widget_count_) |
605 ScheduleIdleHandler(kInitialIdleHandlerDelayMs); | 613 ScheduleIdleHandler(kInitialIdleHandlerDelayMs); |
606 } | 614 } |
607 | 615 |
608 void RenderThreadImpl::WidgetRestored() { | 616 void RenderThreadImpl::WidgetRestored() { |
609 DCHECK_GT(hidden_widget_count_, 0); | 617 DCHECK_GT(hidden_widget_count_, 0); |
610 hidden_widget_count_--; | 618 hidden_widget_count_--; |
619 | |
620 #if !defined(DISCARDABLE_MEMORY_SUPPORTED_NATIVELY) | |
621 RenderProcessVisibilityManager* manager = | |
622 RenderProcessVisibilityManager::GetInstance(); | |
623 manager->WidgetVisibilityChanged(true); | |
624 #endif | |
625 | |
611 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { | 626 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { |
612 return; | 627 return; |
613 } | 628 } |
614 | 629 |
615 ScheduleIdleHandler(kLongIdleHandlerDelayMs); | 630 ScheduleIdleHandler(kLongIdleHandlerDelayMs); |
616 } | 631 } |
617 | 632 |
618 void RenderThreadImpl::EnsureWebKitInitialized() { | 633 void RenderThreadImpl::EnsureWebKitInitialized() { |
619 if (webkit_platform_support_) | 634 if (webkit_platform_support_) |
620 return; | 635 return; |
(...skipping 611 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1232 | 1247 |
1233 void RenderThreadImpl::SetFlingCurveParameters( | 1248 void RenderThreadImpl::SetFlingCurveParameters( |
1234 const std::vector<float>& new_touchpad, | 1249 const std::vector<float>& new_touchpad, |
1235 const std::vector<float>& new_touchscreen) { | 1250 const std::vector<float>& new_touchscreen) { |
1236 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, | 1251 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, |
1237 new_touchscreen); | 1252 new_touchscreen); |
1238 | 1253 |
1239 } | 1254 } |
1240 | 1255 |
1241 } // namespace content | 1256 } // namespace content |
OLD | NEW |