added time to interactive metrics, refactored metrics to use traits

changed task macro to take pipeline info

5 files changed, 7 insertions, 1 deletions

diff --git a/components/script/task_source/dom_manipulation.rs b/components/script/task_source/dom_manipulation.rs
index 5eb20d2d274..16db9310693 100644
--- a/components/script/task_source/dom_manipulation.rs
+++ b/components/script/task_source/dom_manipulation.rs
@@ -37,6 +37,7 @@ impl TaskSource for DOMManipulationTaskSource {
         let msg = MainThreadScriptMsg::Common(CommonScriptMsg::Task(
             ScriptThreadEventCategory::ScriptEvent,
             Box::new(canceller.wrap_task(task)),
+            None    //TODO
         ));
         self.0.send(msg).map_err(|_| ())
     }
diff --git a/components/script/task_source/file_reading.rs b/components/script/task_source/file_reading.rs
index fe2ae2e4d17..8f4cdd80ac3 100644
--- a/components/script/task_source/file_reading.rs
+++ b/components/script/task_source/file_reading.rs
@@ -30,6 +30,7 @@ impl TaskSource for FileReadingTaskSource {
         self.0.send(CommonScriptMsg::Task(
             ScriptThreadEventCategory::FileRead,
             Box::new(canceller.wrap_task(task)),
+            None    //TODO
         ))
     }
 }
diff --git a/components/script/task_source/networking.rs b/components/script/task_source/networking.rs
index 41795227e5d..0c2fd8f6162 100644
--- a/components/script/task_source/networking.rs
+++ b/components/script/task_source/networking.rs
@@ -27,6 +27,7 @@ impl TaskSource for NetworkingTaskSource {
         self.0.send(CommonScriptMsg::Task(
             ScriptThreadEventCategory::NetworkEvent,
             Box::new(canceller.wrap_task(task)),
+            None
         ))
     }
 }
@@ -41,6 +42,7 @@ impl NetworkingTaskSource {
         self.0.send(CommonScriptMsg::Task(
             ScriptThreadEventCategory::NetworkEvent,
             Box::new(task),
+            None                //TODO
         ))
     }
 }
diff --git a/components/script/task_source/performance_timeline.rs b/components/script/task_source/performance_timeline.rs
index 0de171c4949..a91865cf02f 100644
--- a/components/script/task_source/performance_timeline.rs
+++ b/components/script/task_source/performance_timeline.rs
@@ -40,7 +40,8 @@ impl TaskSource for PerformanceTimelineTaskSource {
     {
         let msg = CommonScriptMsg::Task(
             ScriptThreadEventCategory::PerformanceTimelineTask,
-            Box::new(canceller.wrap_task(task))
+            Box::new(canceller.wrap_task(task)),
+            None
         );
         self.0.send(msg).map_err(|_| ())
     }
diff --git a/components/script/task_source/user_interaction.rs b/components/script/task_source/user_interaction.rs
index c10e870ac7e..ba90a26a080 100644
--- a/components/script/task_source/user_interaction.rs
+++ b/components/script/task_source/user_interaction.rs
@@ -37,6 +37,7 @@ impl TaskSource for UserInteractionTaskSource {
         let msg = MainThreadScriptMsg::Common(CommonScriptMsg::Task(
             ScriptThreadEventCategory::InputEvent,
             Box::new(canceller.wrap_task(task)),
+            None
         ));
         self.0.send(msg).map_err(|_| ())
     }