From bd716214e7179bbede6339031cc4e964c9a88b6c Mon Sep 17 00:00:00 2001
From: "Brian J. Burg" <burg@cs.washington.edu>
Date: Wed, 10 Oct 2012 17:50:06 -0700
Subject: [PATCH] Fix some debug message formatting, and add some more cases to
 the UA style simulator.

---
 src/servo/layout/box_builder.rs | 7 +++++++
 src/servo/layout/flow.rs        | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/servo/layout/box_builder.rs b/src/servo/layout/box_builder.rs
index dca7c7c4130..5a39b2ed532 100644
--- a/src/servo/layout/box_builder.rs
+++ b/src/servo/layout/box_builder.rs
@@ -159,6 +159,13 @@ impl LayoutTreeBuilder {
                 ~Element(e) => match e.kind {
                     ~HTMLHeadElement(*) => DisplayNone,
                     ~HTMLScriptElement(*) => DisplayNone,
+                    ~HTMLParagraphElement(*) => DisplayBlock,
+                    ~HTMLDivElement(*) => DisplayBlock,
+                    ~HTMLBodyElement(*) => DisplayBlock,
+                    ~HTMLHeadingElement(*) => DisplayBlock,
+                    ~HTMLHtmlElement(*) => DisplayBlock,
+                    ~HTMLUListElement(*) => DisplayBlock,
+                    ~HTMLOListElement(*) => DisplayBlock,
                     _ => resolved
                 }
             }
diff --git a/src/servo/layout/flow.rs b/src/servo/layout/flow.rs
index 3c379095139..833744bef67 100644
--- a/src/servo/layout/flow.rs
+++ b/src/servo/layout/flow.rs
@@ -358,19 +358,19 @@ impl FlowContext : BoxedDebugMethods {
         let repr = match *self {
             InlineFlow(*) => {
                 let mut s = self.inline().boxes.foldl(~"InlineFlow(children=", |s, box| {
-                    fmt!("%s %?", *s, box.d().id)
+                    fmt!("%s b%d", *s, box.d().id)
                 });
                 s += ~")"; s
             },
             BlockFlow(*) => {
                 match self.block().box {
-                    Some(box) => fmt!("BlockFlow(box=b%?)", box.d().id),
+                    Some(box) => fmt!("BlockFlow(box=b%d)", box.d().id),
                     None => ~"BlockFlow",
                 }
             },
             RootFlow(*) => {
                 match self.root().box {
-                    Some(box) => fmt!("RootFlo(box=b%?)", box.d().id),
+                    Some(box) => fmt!("RootFlo(box=b%d)", box.d().id),
                     None => ~"RootFlow",
                 }
             },