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 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
323 // For measuring memory usage after each task. Behind a command line flag. | 323 // For measuring memory usage after each task. Behind a command line flag. |
324 class MemoryObserver : public base::MessageLoop::TaskObserver { | 324 class MemoryObserver : public base::MessageLoop::TaskObserver { |
325 public: | 325 public: |
326 MemoryObserver() {} | 326 MemoryObserver() {} |
327 virtual ~MemoryObserver() {} | 327 virtual ~MemoryObserver() {} |
328 | 328 |
329 virtual void WillProcessTask(const base::PendingTask& pending_task) OVERRIDE { | 329 virtual void WillProcessTask(const base::PendingTask& pending_task) OVERRIDE { |
330 } | 330 } |
331 | 331 |
332 virtual void DidProcessTask(const base::PendingTask& pending_task) OVERRIDE { | 332 virtual void DidProcessTask(const base::PendingTask& pending_task) OVERRIDE { |
333 HISTOGRAM_MEMORY_KB("Memory.RendererUsed", GetMemoryUsageKB()); | 333 LOCAL_HISTOGRAM_MEMORY_KB("Memory.RendererUsed", GetMemoryUsageKB()); |
334 } | 334 } |
335 | 335 |
336 private: | 336 private: |
337 DISALLOW_COPY_AND_ASSIGN(MemoryObserver); | 337 DISALLOW_COPY_AND_ASSIGN(MemoryObserver); |
338 }; | 338 }; |
339 | 339 |
340 RenderThreadImpl::HistogramCustomizer::HistogramCustomizer() { | 340 RenderThreadImpl::HistogramCustomizer::HistogramCustomizer() { |
341 custom_histograms_.insert("V8.MemoryExternalFragmentationTotal"); | 341 custom_histograms_.insert("V8.MemoryExternalFragmentationTotal"); |
342 custom_histograms_.insert("V8.MemoryHeapSampleTotalCommitted"); | 342 custom_histograms_.insert("V8.MemoryHeapSampleTotalCommitted"); |
343 custom_histograms_.insert("V8.MemoryHeapSampleTotalUsed"); | 343 custom_histograms_.insert("V8.MemoryHeapSampleTotalUsed"); |
(...skipping 1301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1645 hidden_widget_count_--; | 1645 hidden_widget_count_--; |
1646 | 1646 |
1647 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { | 1647 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { |
1648 return; | 1648 return; |
1649 } | 1649 } |
1650 | 1650 |
1651 ScheduleIdleHandler(kLongIdleHandlerDelayMs); | 1651 ScheduleIdleHandler(kLongIdleHandlerDelayMs); |
1652 } | 1652 } |
1653 | 1653 |
1654 } // namespace content | 1654 } // namespace content |
OLD | NEW |