MediaLog: Replace task posting in AddEvent with lock

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 <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 {
 
@@ skipping 12 matching lines @@
   void AddEvent(scoped_ptr<media::MediaLogEvent> event) 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;
 
-  // Add event on the |task_runner_|.
-  void AddEventInternal(scoped_ptr<media::MediaLogEvent> event);
-
-  // Posted as a delayed task to throttle ipc message frequency.
+  // 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 by
+  // |task_runner_|.

[watk, 2016/04/04 20:32:21]

nit: "throttled send by |task_runner_|" -> "throttled send on |task_runner_|".

[wolenetz, 2016/04/04 20:47:55]

Done.

+  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_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderMediaLog);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_RENDER_MEDIA_LOG_H_