aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/websocket.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-10-25 15:53:57 -0500
committerGitHub <noreply@github.com>2017-10-25 15:53:57 -0500
commite438b094f675469b8bdbb1ab4ff84c374fc399d4 (patch)
treeac770703c621ba261b264d6f079f669c6537af4c /components/script/dom/websocket.rs
parentce890be0b958dd4623defd789c19e02f4da6ea1d (diff)
parent52b63def44b4819184d2badcc4d123b770a7878a (diff)
downloadservo-e438b094f675469b8bdbb1ab4ff84c374fc399d4.tar.gz
servo-e438b094f675469b8bdbb1ab4ff84c374fc399d4.zip
Auto merge of #18670 - avadacatavra:interactive-metrics, r=jdm
added time to interactive metrics <!-- Please describe your changes on the following line: --> Added time to interactive metrics and refactored metrics/lib I need to write tests, but wanted to submit the PR for review --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [ ] `./mach build -d` does not report any errors - [ ] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18670) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/websocket.rs')
-rw-r--r--components/script/dom/websocket.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs
index d8425d1d5b8..1048f26a85e 100644
--- a/components/script/dom/websocket.rs
+++ b/components/script/dom/websocket.rs
@@ -262,9 +262,10 @@ impl WebSocket {
address: address,
});
+ let pipeline_id = self.global().pipeline_id();
self.global()
.script_chan()
- .send(CommonScriptMsg::Task(WebSocketEvent, task))
+ .send(CommonScriptMsg::Task(WebSocketEvent, task, Some(pipeline_id)))
.unwrap();
}