Auto merge of #7435 - Ms2ger:markers, r=jdm

Send the start and end half of a TimelineMarker to the devtools …

…PullTimelineMarkers thread together.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7435)
<!-- Reviewable:end -->

1 files changed, 7 insertions, 8 deletions

diff --git a/components/script/script_task.rs b/components/script/script_task.rs
index 5ae982bbee5..1ab86d67570 100644
--- a/components/script/script_task.rs
+++ b/components/script/script_task.rs
@@ -52,8 +52,8 @@ use timers::TimerId;
 use webdriver_handlers;
 
 use devtools_traits::{DevtoolsPageInfo, DevtoolScriptControlMsg};
-use devtools_traits::{ScriptToDevtoolsControlMsg, TimelineMarker, TimelineMarkerType};
-use devtools_traits::{TracingMetadata};
+use devtools_traits::{ScriptToDevtoolsControlMsg, TimelineMarker};
+use devtools_traits::{StartedTimelineMarker, TimelineMarkerType};
 use msg::compositor_msg::{LayerId, ScriptToCompositorMsg};
 use msg::constellation_msg::Msg as ConstellationMsg;
 use msg::constellation_msg::{ConstellationChan, FocusType};
@@ -2016,23 +2016,22 @@ impl Drop for ScriptTask {
 }
 
 struct AutoDOMEventMarker<'a> {
-    script_task: &'a ScriptTask
+    script_task: &'a ScriptTask,
+    marker: Option<StartedTimelineMarker>,
 }
 
 impl<'a> AutoDOMEventMarker<'a> {
     fn new(script_task: &'a ScriptTask) -> AutoDOMEventMarker<'a> {
-        let marker = TimelineMarker::new("DOMEvent".to_owned(), TracingMetadata::IntervalStart);
-        script_task.emit_timeline_marker(marker);
         AutoDOMEventMarker {
-            script_task: script_task
+            script_task: script_task,
+            marker: Some(TimelineMarker::start("DOMEvent".to_owned())),
         }
     }
 }
 
 impl<'a> Drop for AutoDOMEventMarker<'a> {
     fn drop(&mut self) {
-        let marker = TimelineMarker::new("DOMEvent".to_owned(), TracingMetadata::IntervalEnd);
-        self.script_task.emit_timeline_marker(marker);
+        self.script_task.emit_timeline_marker(self.marker.take().unwrap().end());
     }
 }