summaryrefslogtreecommitdiffstats
path: root/content/browser/resources/media
diff options
context:
space:
mode:
authortyoverby@chromium.org <tyoverby@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-26 04:21:41 +0000
committertyoverby@chromium.org <tyoverby@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-26 04:21:41 +0000
commitfbc46bd75594f4870afc6c07e9e88654a545e7ed (patch)
treee4c86c9487e63d7cb17fa3071b4f402646a77fc8 /content/browser/resources/media
parent7e09a30e33119b4d44626b555ecb28e56f303bf2 (diff)
downloadchromium_src-fbc46bd75594f4870afc6c07e9e88654a545e7ed.zip
chromium_src-fbc46bd75594f4870afc6c07e9e88654a545e7ed.tar.gz
chromium_src-fbc46bd75594f4870afc6c07e9e88654a545e7ed.tar.bz2
Made media::MediaLogEvent use base::TimeTicks instead of base::Time.
base::Time has the unfortumate ability to decrease (due to change of timezone, user change, etc), a feature which makes it a poor choice to use for logging. base::TimeTicks does not have this disadvantage so it replaces base::Time for logging purposes. initial changes to time in media_internals BUG=249212 Review URL: https://chromiumcodereview.appspot.com/17444015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208621 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/resources/media')
-rw-r--r--content/browser/resources/media/event_list.js8
-rw-r--r--content/browser/resources/media/metrics.js6
2 files changed, 6 insertions, 8 deletions
diff --git a/content/browser/resources/media/event_list.js b/content/browser/resources/media/event_list.js
index fc13c05..df4d427 100644
--- a/content/browser/resources/media/event_list.js
+++ b/content/browser/resources/media/event_list.js
@@ -41,12 +41,12 @@ cr.define('media', function() {
* @param {Object} event The MediaLogEvent that has occurred.
*/
addEvent: function(event) {
- var timeInMs = event.time * 1000; // Work with milliseconds.
- this.startTime_ = this.startTime_ || timeInMs;
- timeInMs -= this.startTime_;
+ this.startTime_ = this.startTime_ || event.ticksMillis;
+ var normalizedTicksMillis = event.ticksMillis - this.startTime_;
var row = document.createElement('tr');
- row.appendChild(media.makeElement('td', timeInMs.toFixed(1)));
+ row.appendChild(media.makeElement(
+ 'td', normalizedTicksMillis.toFixed(1)));
row.appendChild(media.makeElement('td', event.type));
var params = [];
for (var key in event.params) {
diff --git a/content/browser/resources/media/metrics.js b/content/browser/resources/media/metrics.js
index 2c40f4a..c812d44f 100644
--- a/content/browser/resources/media/metrics.js
+++ b/content/browser/resources/media/metrics.js
@@ -78,14 +78,12 @@ cr.define('media', function() {
* @param {string} type The type of event.
*/
addEventInternal: function(event, type) {
- var timeInMs = event.time * 1000; // Work with milliseconds.
-
for (var metric in metrics) {
var m = this[metric];
if (type == metrics[metric].start && !m.start) {
- m.start = timeInMs;
+ m.start = event.ticksMillis;
} else if (type == metrics[metric].end && m.start != null) {
- var last = timeInMs - m.start;
+ var last = event.ticksMillis - m.start;
m.last.textContent = last.toFixed(1);
m.total += last;
m.count++;