aboutsummaryrefslogtreecommitdiffstats
path: root/components/devtools_traits/lib.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2019-12-08 12:12:40 -0500
committerGitHub <noreply@github.com>2019-12-08 12:12:40 -0500
commit136366bf641f08590ba60cbe2fa98ecc3181a98e (patch)
tree9e726e31e8a1448cce839a93aa25d54573b6a3fe /components/devtools_traits/lib.rs
parentf2b363b3f006c90d77c7cc04f72ef00e676fa23a (diff)
parentb3b886e837792bc130d3514bef4d8619aed4c41d (diff)
downloadservo-136366bf641f08590ba60cbe2fa98ecc3181a98e.tar.gz
servo-136366bf641f08590ba60cbe2fa98ecc3181a98e.zip
Auto merge of #25161 - paulrouget:cachedMsgs, r=jdm
devtools: save and send cached messages @jdm the only real difference between your original patch and this PR is the removal of the `GetCachedMessages` messages that are not necessary anymore now that we directly send the message to the devtools. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #13161 (GitHub issue number if applicable)
Diffstat (limited to 'components/devtools_traits/lib.rs')
-rw-r--r--components/devtools_traits/lib.rs11
1 files changed, 4 insertions, 7 deletions
diff --git a/components/devtools_traits/lib.rs b/components/devtools_traits/lib.rs
index 177a0d7da1c..0e0872e7663 100644
--- a/components/devtools_traits/lib.rs
+++ b/components/devtools_traits/lib.rs
@@ -82,6 +82,9 @@ pub enum ScriptToDevtoolsControlMsg {
/// Report a CSS parse error for the given pipeline
ReportCSSError(PipelineId, CSSError),
+
+ /// Report a page error for the given pipeline
+ ReportPageError(PipelineId, PageError),
}
/// Serialized JS return values
@@ -196,12 +199,6 @@ pub enum DevtoolScriptControlMsg {
GetChildren(PipelineId, String, IpcSender<Option<Vec<NodeInfo>>>),
/// Retrieve the computed layout properties of the given node in the given pipeline.
GetLayout(PipelineId, String, IpcSender<Option<ComputedNodeLayout>>),
- /// Retrieve all stored console messages for the given pipeline.
- GetCachedMessages(
- PipelineId,
- CachedConsoleMessageTypes,
- IpcSender<Vec<CachedConsoleMessage>>,
- ),
/// Update a given node's attributes with a list of modifications.
ModifyAttribute(PipelineId, String, Vec<Modification>),
/// Request live console messages for a given pipeline (true if desired, false otherwise).
@@ -253,7 +250,7 @@ bitflags! {
}
}
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, Serialize)]
pub struct PageError {
#[serde(rename = "_type")]
pub type_: String,