Media: Report informational error messages to HTMLMediaElement

content/renderer/media/render_media_log.h

 // Copyright (c) 2012 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 CONTENT_RENDERER_MEDIA_RENDER_MEDIA_LOG_H_
 #define CONTENT_RENDERER_MEDIA_RENDER_MEDIA_LOG_H_
 
+#include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/synchronization/lock.h"
 #include "base/time/time.h"
 #include "content/common/content_export.h"
 #include "media/base/media_log.h"
 
 namespace base {
 class TickClock;
 }
 
 namespace content {
 
 // RenderMediaLog is an implementation of MediaLog that forwards events to the
 // browser process, throttling as necessary.
 //
+// It also caches the last error messages to support renderer-side reporting to

[watk, 2016/04/04 23:47:25]

s/messages/events?

[wolenetz, 2016/04/05 00:23:27]

Done.

+// entities like HTMLMediaElement and devtools console.
+//
 // To minimize the number of events sent over the wire, only the latest event
 // added is sent for high frequency events (e.g., BUFFERED_EXTENTS_CHANGED).
 //
 // It must be constructed on the render thread.
 class CONTENT_EXPORT RenderMediaLog : public media::MediaLog {
  public:
   RenderMediaLog();
 
   // MediaLog implementation.
   void AddEvent(scoped_ptr<media::MediaLogEvent> event) override;
+  std::string GetLastErrorMessage() override;
 
   // Will reset |last_ipc_send_time_| with the value of NowTicks().
   void SetTickClockForTesting(scoped_ptr<base::TickClock> tick_clock);
   void SetTaskRunnerForTesting(
       const scoped_refptr<base::SingleThreadTaskRunner>& task_runner);
 
  private:
   ~RenderMediaLog() override;
 
   // Posted as a delayed task on |task_runner_| to throttle ipc message
   // frequency.
   void SendQueuedMediaEvents();
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
   // |lock_| serializes access to |tick_clock_|, |last_ipc_send_time_|,
-  // |queued_media_events_|, |ipc_send_pending_| and
-  // |last_buffered_extents_changed_event_|. It allows any render process thread
-  // to AddEvent(), while preserving their sequence for throttled send on
-  // |task_runner_|.
+  // |queued_media_events_|, |ipc_send_pending_|,
+  // |last_buffered_extents_changed_event_|, |last_media_error_log_entry_| and
+  // |last_pipeline_error_|. It allows any render process thread to AddEvent(),

[watk, 2016/04/04 23:47:25]

You could say lock protects access to all following member variables if this is
too annoying.

[wolenetz, 2016/04/05 00:23:27]

Done.

+  // while preserving their sequence for throttled send on |task_runner_| and
+  // coherent retrieval by GetLastErrorMessage().
   mutable base::Lock lock_;
   scoped_ptr<base::TickClock> tick_clock_;
   base::TimeTicks last_ipc_send_time_;
   std::vector<media::MediaLogEvent> queued_media_events_;
 
   // For enforcing max 1 pending send.
   bool ipc_send_pending_;
 
   // Limits the number buffered extents changed events we send over IPC to one.
   scoped_ptr<media::MediaLogEvent> last_buffered_extents_changed_event_;
 
+  // Holds a copy of the most recent MEDIA_ERROR_LOG_ENTRY, if any.
+  scoped_ptr<media::MediaLogEvent> last_media_error_log_entry_;
+
+  // Holds a copy of the most recent PIPELINE_ERROR, if any.
+  scoped_ptr<media::MediaLogEvent> last_pipeline_error_;
+
   DISALLOW_COPY_AND_ASSIGN(RenderMediaLog);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_RENDER_MEDIA_LOG_H_