Skip to content

Commit

Permalink
Auto merge of servo#3339 - servo:kvark-frame-id, r=emilio
Browse files Browse the repository at this point in the history
Add default deserializer for frame_id

Since frame ID is debug-only, it's not serialized when capturing from a release-built Firefox, making us unable to replay it with debug Wrench. This PR fixes this (broken recently by servo#3289).

r? anyone

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/3339)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo authored Nov 22, 2018
2 parents 29dab25 + 265116c commit 1ad9b79
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions webrender/src/render_task.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ pub struct RenderTaskId {
pub index: u32,

#[cfg(debug_assertions)]
#[cfg_attr(feature = "replay", serde(default = "FrameId::first"))]
frame_id: FrameId,
}

Expand Down

0 comments on commit 1ad9b79

Please sign in to comment.