Fixed layout flow tree JSON serialization

This commit is contained in:
Shing Lyu 2016-08-19 15:29:25 +08:00
parent 17df3c276b
commit a07be4c850
2 changed files with 3 additions and 3 deletions

View file

@ -997,7 +997,7 @@ impl fmt::Debug for BaseFlow {
impl Encodable for BaseFlow { impl Encodable for BaseFlow {
fn encode<S: Encoder>(&self, e: &mut S) -> Result<(), S::Error> { fn encode<S: Encoder>(&self, e: &mut S) -> Result<(), S::Error> {
e.emit_struct("base", 0, |e| { e.emit_struct("base", 5, |e| {
try!(e.emit_struct_field("id", 0, |e| self.debug_id().encode(e))); try!(e.emit_struct_field("id", 0, |e| self.debug_id().encode(e)));
try!(e.emit_struct_field("stacking_relative_position", try!(e.emit_struct_field("stacking_relative_position",
1, 1,
@ -1010,7 +1010,7 @@ impl Encodable for BaseFlow {
e.emit_seq(self.children.len(), |e| { e.emit_seq(self.children.len(), |e| {
for (i, c) in self.children.iter().enumerate() { for (i, c) in self.children.iter().enumerate() {
try!(e.emit_seq_elt(i, |e| { try!(e.emit_seq_elt(i, |e| {
try!(e.emit_struct("flow", 0, |e| { try!(e.emit_struct("flow", 2, |e| {
try!(e.emit_struct_field("class", 0, |e| c.class().encode(e))); try!(e.emit_struct_field("class", 0, |e| c.class().encode(e)));
e.emit_struct_field("data", 1, |e| { e.emit_struct_field("data", 1, |e| {
match c.class() { match c.class() {

View file

@ -132,7 +132,7 @@ pub struct Fragment {
impl Encodable for Fragment { impl Encodable for Fragment {
fn encode<S: Encoder>(&self, e: &mut S) -> Result<(), S::Error> { fn encode<S: Encoder>(&self, e: &mut S) -> Result<(), S::Error> {
e.emit_struct("fragment", 0, |e| { e.emit_struct("fragment", 3, |e| {
try!(e.emit_struct_field("id", 0, |e| self.debug_id.encode(e))); try!(e.emit_struct_field("id", 0, |e| self.debug_id.encode(e)));
try!(e.emit_struct_field("border_box", 1, |e| self.border_box.encode(e))); try!(e.emit_struct_field("border_box", 1, |e| self.border_box.encode(e)));
e.emit_struct_field("margin", 2, |e| self.margin.encode(e)) e.emit_struct_field("margin", 2, |e| self.margin.encode(e))