From d0f4d850464f0a0660cfd5b7897388a29616f6d7 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Thu, 6 Sep 2012 14:05:09 -0700
Subject: [PATCH 1/4] Update rust-azure

---
 src/rust-azure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rust-azure b/src/rust-azure
index 34a6c78cce4..29ba569a08c 160000
--- a/src/rust-azure
+++ b/src/rust-azure
@@ -1 +1 @@
-Subproject commit 34a6c78cce40e9e01f330cf1324672d65d94a97b
+Subproject commit 29ba569a08c906dc8a15ed712c35d51c341abf61

From 6261f4e6d978b309d534a8805166f90b0fb61cb4 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Thu, 6 Sep 2012 14:06:22 -0700
Subject: [PATCH 2/4] Don't run check-ref by default. Not working

---
 Makefile.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makefile.in b/Makefile.in
index fa2a22776aa..8cea5b05d7f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -94,7 +94,6 @@ CHECK_DEPS += \
 	check-rust-layers \
 	check-rust-http-client \
 	check-servo \
-	check-ref \
 	$(NULL)
 
 CLEAN_DEPS += \

From 9712b74c9f23d20d7727d4cb9b2410e3c02cdde6 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Thu, 6 Sep 2012 14:14:38 -0700
Subject: [PATCH 3/4] Add missing case to BoxKind : Eq

---
 src/servo/layout/base.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/servo/layout/base.rs b/src/servo/layout/base.rs
index 6a46e66de89..284c7aa65f0 100644
--- a/src/servo/layout/base.rs
+++ b/src/servo/layout/base.rs
@@ -34,6 +34,7 @@ impl BoxKind : cmp::Eq {
     pure fn eq(&&other: BoxKind) -> bool {
         match (self, other) {
           (BlockBox, BlockBox) => true,
+          (InlineBox, InlineBox) => true,
           _ => fail ~"unimplemented case in BoxKind.eq"
         }
     }

From 3942374fe29e90616be6654b0700fe95890e338e Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Thu, 6 Sep 2012 14:30:02 -0700
Subject: [PATCH 4/4] Add a test for line breaking

---
 src/test/test-text-break.html | 52 +++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 src/test/test-text-break.html

diff --git a/src/test/test-text-break.html b/src/test/test-text-break.html
new file mode 100644
index 00000000000..620a5e4c52c
--- /dev/null
+++ b/src/test/test-text-break.html
@@ -0,0 +1,52 @@
+<div>
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam at
+ipsum orci. Ut mauris erat, pretium eu interdum a, feugiat ut
+leo. Proin eu purus lorem, scelerisque pretium turpis. Donec tempus
+mollis tortor, sed feugiat felis tincidunt ut. Donec elit sem,
+condimentum ac pellentesque id, facilisis non erat. Nam neque urna,
+interdum non tempor nec, cursus at erat. Pellentesque id diam leo.
+
+Nullam sit amet pellentesque urna. Sed non vehicula felis. Suspendisse
+vitae mattis dolor. Nam euismod, quam ac dapibus dapibus, tellus erat
+vulputate purus, at tempus sem sapien quis risus. Aenean tempor
+feugiat urna quis viverra. Duis eleifend tortor semper metus fringilla
+non rhoncus eros suscipit. Nullam turpis nibh, condimentum sed tempor
+sit amet, tristique nec nisi. In cursus sagittis pulvinar. Vestibulum
+ut felis at augue sagittis tristique. Aliquam est urna, auctor quis
+faucibus ac, lobortis quis felis. Integer orci diam, rutrum eleifend
+congue at, viverra id urna. Nam tempor posuere commodo.
+
+Integer sit amet pretium erat. Nullam mollis egestas orci, at mattis
+risus facilisis ut. Cum sociis natoque penatibus et magnis dis
+parturient montes, nascetur ridiculus mus. Praesent ligula nisi,
+consequat a faucibus ac, pharetra vel enim. Fusce non sem ut nulla
+bibendum malesuada suscipit nec felis. Nulla vel quam et risus egestas
+facilisis a malesuada ante. Phasellus id convallis nisl. Aenean
+posuere elit non metus tempus id ullamcorper orci dignissim.
+
+Ut tincidunt magna massa, eget sollicitudin nulla. Aliquam venenatis
+porttitor tellus, at suscipit mauris dignissim eget. Duis odio mi,
+scelerisque eu ornare sed, malesuada ac leo. Aliquam erat
+volutpat. Nulla dignissim tristique dolor rutrum viverra. Nam ipsum
+quam, bibendum sed sodales laoreet, congue at elit. Aenean nec
+ultricies dui. Vivamus arcu lacus, lacinia sit amet congue et,
+interdum sed metus. Nam posuere lacus id sapien varius ut imperdiet
+purus molestie. Aliquam erat volutpat. Donec et volutpat
+turpis. Quisque elementum massa sit amet lorem malesuada id placerat
+ipsum gravida. Quisque suscipit arcu vitae risus commodo at laoreet
+enim aliquam. Nam euismod dictum ipsum, condimentum commodo augue
+bibendum ac. Cras ut urna eu ipsum ornare pretium. Lorem ipsum dolor
+sit amet, consectetur adipiscing elit.
+
+Donec elit quam, dignissim ut pulvinar et, auctor tincidunt
+lacus. Aenean non ipsum ornare orci gravida mollis. Vivamus suscipit,
+dui sed dapibus fermentum, tellus enim elementum nulla, non gravida
+augue urna volutpat quam. Nullam metus quam, vehicula sit amet ornare
+eget, auctor a purus. Curabitur lacus eros, suscipit non lobortis non,
+tincidunt a risus. Duis laoreet, dolor a aliquam laoreet, lorem turpis
+varius eros, nec sodales est felis id metus. Nullam sit amet tincidunt
+justo. Nam sit amet arcu bibendum augue sagittis tincidunt non
+dignissim lorem. Maecenas quis justo lacus. Nam fringilla ullamcorper
+tellus at sollicitudin.
+</div>
+