| 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/media/render_media_log.h" | 5 #include "content/renderer/media/render_media_log.h" |
| 6 | 6 |
| 7 #include <sstream> | 7 #include <sstream> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/location.h" | 10 #include "base/location.h" |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 event->type != media::MediaLogEvent::NETWORK_ACTIVITY_SET) { | 35 event->type != media::MediaLogEvent::NETWORK_ACTIVITY_SET) { |
| 36 MEDIA_EVENT_LOG_UTILITY << "MediaEvent: " | 36 MEDIA_EVENT_LOG_UTILITY << "MediaEvent: " |
| 37 << media::MediaLog::MediaEventToLogString(*event); | 37 << media::MediaLog::MediaEventToLogString(*event); |
| 38 } | 38 } |
| 39 } | 39 } |
| 40 | 40 |
| 41 } // namespace | 41 } // namespace |
| 42 | 42 |
| 43 namespace content { | 43 namespace content { |
| 44 | 44 |
| 45 RenderMediaLog::RenderMediaLog(const GURL& security_origin) | 45 RenderMediaLog::RenderMediaLog( |
| 46 const GURL& security_origin, |
| 47 scoped_refptr<base::SingleThreadTaskRunner> task_runner) |
| 46 : security_origin_(security_origin), | 48 : security_origin_(security_origin), |
| 47 task_runner_(base::ThreadTaskRunnerHandle::Get()), | 49 task_runner_(task_runner), |
| 48 tick_clock_(new base::DefaultTickClock()), | 50 tick_clock_(new base::DefaultTickClock()), |
| 49 last_ipc_send_time_(tick_clock_->NowTicks()), | 51 last_ipc_send_time_(tick_clock_->NowTicks()), |
| 50 ipc_send_pending_(false) { | 52 ipc_send_pending_(false) { |
| 51 DCHECK(RenderThread::Get()) | 53 DCHECK(RenderThread::Get()) |
| 52 << "RenderMediaLog must be constructed on the render thread"; | 54 << "RenderMediaLog must be constructed on the render thread"; |
| 53 } | 55 } |
| 54 | 56 |
| 55 void RenderMediaLog::AddEvent(std::unique_ptr<media::MediaLogEvent> event) { | 57 void RenderMediaLog::AddEvent(std::unique_ptr<media::MediaLogEvent> event) { |
| 56 Log(event.get()); | 58 Log(event.get()); |
| 57 | 59 |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 180 tick_clock_.swap(tick_clock); | 182 tick_clock_.swap(tick_clock); |
| 181 last_ipc_send_time_ = tick_clock_->NowTicks(); | 183 last_ipc_send_time_ = tick_clock_->NowTicks(); |
| 182 } | 184 } |
| 183 | 185 |
| 184 void RenderMediaLog::SetTaskRunnerForTesting( | 186 void RenderMediaLog::SetTaskRunnerForTesting( |
| 185 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) { | 187 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) { |
| 186 task_runner_ = task_runner; | 188 task_runner_ = task_runner; |
| 187 } | 189 } |
| 188 | 190 |
| 189 } // namespace content | 191 } // namespace content |
| OLD | NEW |