1 files changed, 32 insertions, 11 deletions
diff --git a/chromium/content/renderer/media/render_media_log.cc b/chromium/content/renderer/media/render_media_log.cc
index 5515ecc394e..d20f622ec74 100644
--- a/chromium/content/renderer/media/render_media_log.cc
+++ b/chromium/content/renderer/media/render_media_log.cc
@@ -8,38 +8,59 @@
 #include "base/logging.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "content/common/view_messages.h"
-#include "content/renderer/render_thread_impl.h"
-
-using base::Time;
-using base::TimeDelta;
+#include "content/public/renderer/render_thread.h"
 
 namespace content {
 
 RenderMediaLog::RenderMediaLog()
     : render_loop_(base::MessageLoopProxy::current()),
-      last_ipc_send_time_(Time::Now()) {
-  DCHECK(RenderThreadImpl::current()) <<
+      tick_clock_(new base::DefaultTickClock()),
+      last_ipc_send_time_(tick_clock_->NowTicks()) {
+  DCHECK(RenderThread::Get()) <<
       "RenderMediaLog must be constructed on the render thread";
 }
 
 void RenderMediaLog::AddEvent(scoped_ptr<media::MediaLogEvent> event) {
-  if (!RenderThreadImpl::current()) {
+  if (!RenderThread::Get()) {
     render_loop_->PostTask(FROM_HERE, base::Bind(
         &RenderMediaLog::AddEvent, this, base::Passed(&event)));
     return;
   }
-  queued_media_events_.push_back(*event);
+
+  // Keep track of the latest buffered extents properties to avoid sending
+  // thousands of events over IPC. See http://crbug.com/352585 for details.
+  //
+  // TODO(scherkus): We should overhaul MediaLog entirely to have clearer
+  // separation of properties vs. events.
+  if (event->type == media::MediaLogEvent::BUFFERED_EXTENTS_CHANGED)
+    last_buffered_extents_changed_event_.swap(event);
+  else
+    queued_media_events_.push_back(*event);
+
   // Limit the send rate of high frequency events.
-  Time curr_time = Time::Now();
-  if ((curr_time - last_ipc_send_time_) < TimeDelta::FromSeconds(1))
+  base::TimeTicks curr_time = tick_clock_->NowTicks();
+  if ((curr_time - last_ipc_send_time_) < base::TimeDelta::FromSeconds(1))
     return;
   last_ipc_send_time_ = curr_time;
+
+  if (last_buffered_extents_changed_event_) {
+    queued_media_events_.push_back(*last_buffered_extents_changed_event_);
+    last_buffered_extents_changed_event_.reset();
+  }
+
   DVLOG(1) << "media log events array size " << queued_media_events_.size();
-  RenderThreadImpl::current()->Send(
+
+  RenderThread::Get()->Send(
       new ViewHostMsg_MediaLogEvents(queued_media_events_));
   queued_media_events_.clear();
 }
 
 RenderMediaLog::~RenderMediaLog() {}
 
+void RenderMediaLog::SetTickClockForTesting(
+    scoped_ptr<base::TickClock> tick_clock) {
+  tick_clock_.swap(tick_clock);
+  last_ipc_send_time_ = tick_clock_->NowTicks();
+}
+
 }  // namespace content