Chromium Code Reviews| Index: content/renderer/render_thread_impl.cc |
| diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc |
| index f15738dd00aa0f4b4096928efe16ee39d3030c9a..dd5a8c1968a8ca95a27767f61ae58a1521adada6 100644 |
| --- a/content/renderer/render_thread_impl.cc |
| +++ b/content/renderer/render_thread_impl.cc |
| @@ -77,7 +77,6 @@ |
| #include "content/renderer/memory_benchmarking_extension.h" |
| #include "content/renderer/p2p/socket_dispatcher.h" |
| #include "content/renderer/render_process_impl.h" |
| -#include "content/renderer/render_process_visibility_manager.h" |
| #include "content/renderer/render_view_impl.h" |
| #include "content/renderer/renderer_webkitplatformsupport_impl.h" |
| #include "content/renderer/skia_benchmarking_extension.h" |
| @@ -580,7 +579,8 @@ scoped_refptr<base::MessageLoopProxy> |
| return ChildProcess::current()->io_message_loop_proxy(); |
| } |
| -void RenderThreadImpl::AddRoute(int32 routing_id, IPC::Listener* listener) { |
| +void RenderThreadImpl::AddRoute(int32 routing_id, |
| + IPC::Listener* listener) { |
|
Charlie Reis
2013/08/20 02:09:58
Style nit: No need for this change, since both arg
|
| widget_count_++; |
| return ChildThread::AddRoute(routing_id, listener); |
| } |
| @@ -622,29 +622,25 @@ void RenderThreadImpl::SetResourceDispatcherDelegate( |
| } |
| void RenderThreadImpl::WidgetHidden() { |
| - DCHECK(hidden_widget_count_ < widget_count_); |
| + DCHECK_LT(hidden_widget_count_, widget_count_); |
| hidden_widget_count_++; |
| - RenderProcessVisibilityManager* manager = |
| - RenderProcessVisibilityManager::GetInstance(); |
| - manager->WidgetVisibilityChanged(false); |
| - |
| - if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { |
| - return; |
| + if (widget_count_ && hidden_widget_count_ == widget_count_) { |
| +#if !defined(SYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE) |
| + // TODO(vollick): Remove this this heavy-handed approach once we're polling |
| + // the real system memory pressure. |
| + base::MemoryPressureListener::NotifyMemoryPressure( |
| + base::MemoryPressureListener::MEMORY_PRESSURE_MODERATE); |
| +#endif |
| + if (GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) |
| + ScheduleIdleHandler(kInitialIdleHandlerDelayMs); |
| } |
| - |
| - if (widget_count_ && hidden_widget_count_ == widget_count_) |
| - ScheduleIdleHandler(kInitialIdleHandlerDelayMs); |
| } |
| void RenderThreadImpl::WidgetRestored() { |
| DCHECK_GT(hidden_widget_count_, 0); |
| hidden_widget_count_--; |
| - RenderProcessVisibilityManager* manager = |
| - RenderProcessVisibilityManager::GetInstance(); |
| - manager->WidgetVisibilityChanged(true); |
| - |
| if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { |
| return; |
| } |
| @@ -1146,6 +1142,7 @@ void RenderThreadImpl::OnCreateNewView(const ViewMsg_New_Params& params) { |
| params.frame_name, |
| false, |
| params.swapped_out, |
| + params.hidden, |
| params.next_page_id, |
| params.screen_info, |
| params.accessibility_mode, |