Report WMPI components memory usage to UMA

media/blink/webmediaplayer_impl.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_
 #define MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/cancelable_callback.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/linked_ptr.h"
+#include "base/memory/memory_pressure_listener.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
+#include "base/optional.h"
 #include "base/threading/thread.h"
 #include "base/time/default_tick_clock.h"
 #include "base/timer/elapsed_timer.h"
 #include "base/timer/timer.h"
 #include "build/build_config.h"
 #include "media/base/media_observer.h"
 #include "media/base/media_tracks.h"
 #include "media/base/pipeline_impl.h"
 #include "media/base/renderer_factory.h"
 #include "media/base/surface_manager.h"
@@ skipping 308 matching lines @@
                                              bool is_streaming,
                                              bool is_suspended,
                                              bool is_backgrounded);
   void SetDelegateState(DelegateState new_state);
   void SetMemoryReportingState(bool is_memory_reporting_enabled);
   void SetSuspendState(bool is_suspended);
 
   // Called at low frequency to tell external observers how much memory we're
   // using for video playback.  Called by |memory_usage_reporting_timer_|.
   // Memory usage reporting is done in two steps, because |demuxer_| must be
-  // accessed on the media thread.
-  void ReportMemoryUsage();
-  void FinishMemoryUsageReport(int64_t demuxer_memory_usage);
+  // accessed on the media thread. Also called when we get notified about memory

[watk, 2016/12/13 23:34:31]

nit: merge the "Also called when" sentence with the "Called by" above.

[servolk, 2016/12/14 00:07:23]

Done.

+  // pressure level changes.
+  void ReportMemoryUsageOnTimer();
+  using MaybeMemPressureLvl =

[watk, 2016/12/13 23:34:31]

nit: It's probably more obvious if you call this OptionalMemoryPressureLevel

[servolk, 2016/12/14 00:07:23]

Done.

+      base::Optional<base::MemoryPressureListener::MemoryPressureLevel>;
+  void ReportMemoryUsage(MaybeMemPressureLvl maybe_mem_pressure_lvl);
+  void FinishMemoryUsageReport(MaybeMemPressureLvl maybe_mem_pressure_lvl,
+                               int64_t demuxer_memory_usage);

[watk, 2016/12/13 23:34:31]

nit: This is minor but I'd s/lvl/level and s/mem/memory everywhere. Both lvl and
mem are well known enough that I think they're within the style guide
recommendation for abbreviations, but they're uncommon in media code at least.
(e.g.,
https://cs.chromium.org/search/?q=file:media/+lvl%5Cb&sq=package:chromium&typ...)

Up to you though.

[servolk, 2016/12/14 00:07:23]

Done.

 
   // Called during OnHidden() when we want a suspended player to enter the
   // paused state after some idle timeout.
   void ScheduleIdlePauseTimer();
 
   void CreateWatchTimeReporter();
 
   // Returns true if the player is hidden.
   bool IsHidden() const;
 
+  void OnMemoryPressure(base::MemoryPressureListener::MemoryPressureLevel lvl);
+
   blink::WebLocalFrame* frame_;
 
   // The playback state last reported to |delegate_|, to avoid setting duplicate
   // states. (Which can have undesired effects like resetting the idle timer.)
   DelegateState delegate_state_;
 
   // Set when OnSuspendRequested() is called with |must_suspend| unset.
   bool is_idle_;
 
   // Set when OnSuspendRequested() is called with |must_suspend| set.
@@ skipping 201 matching lines @@
   base::TimeTicks last_time_loading_progressed_;
 
   std::unique_ptr<base::TickClock> tick_clock_;
 
   // Monitors the player events.
   base::WeakPtr<MediaObserver> observer_;
 
   // Whether the player is currently in autoplay muted state.
   bool autoplay_muted_ = false;
 
+  std::unique_ptr<base::MemoryPressureListener> mem_pressure_listener_;
+
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_