servo: Merge branch 'master' of ssh://github.com/mozilla/servo
authorBrian Anderson <banderson@mozilla.com>
Thu, 06 Sep 2012 14:57:21 -0700
changeset 361880 4b7addef788dbdc8c038ecf8c35bc0bd263e5c27
parent 361879 85dea2f644e5cd4922cefef8d13533213ad08524
child 361881 fb4fcf0a123f4a6988b2c5bb5f91a641bd6d734d
push id10863
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 23:02:23 +0000
treeherdermozilla-aurora@0931190cd725 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
servo: Merge branch 'master' of ssh://github.com/mozilla/servo Source-Repo: https://github.com/servo/servo Source-Revision: 10f1729a71f0a8cc0801e8cc6eeedfa8e9117f0f
servo/Makefile.in
servo/src/servo/layout/base.rs
servo/src/test/test-text-break.html
--- a/servo/Makefile.in
+++ b/servo/Makefile.in
@@ -89,17 +89,16 @@ CHECK_DEPS += \
 	check-rust-azure \
 	check-rust-stb-image \
 	check-rust-geom \
 	check-rust-opengles \
 	check-rust-glut \
 	check-rust-layers \
 	check-rust-http-client \
 	check-servo \
-	check-ref \
 	$(NULL)
 
 CLEAN_DEPS += \
 	clean-rust-harfbuzz \
 	clean-rust-mozjs \
 	clean-rust-azure \
 	clean-rust-stb-image \
 	clean-rust-geom \
--- a/servo/src/servo/layout/base.rs
+++ b/servo/src/servo/layout/base.rs
@@ -29,16 +29,17 @@ enum BoxKind {
     IntrinsicBox(@Size2D<au>),
     TextBoxKind(@TextBox)
 }
 
 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"
         }
     }
 }
 
 struct Appearance {
     let mut background_image: Option<ImageHolder>;
     let mut background_color: Color;
new file mode 100644
--- /dev/null
+++ b/servo/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>
+