solid_color -> display_item_solid_color (preparation for display_item_image)

3 files changed, 5 insertions, 5 deletions

diff --git a/src/servo/gfx/renderer.rs b/src/servo/gfx/renderer.rs
index ca403902fb4..9e819663982 100644
--- a/src/servo/gfx/renderer.rs
+++ b/src/servo/gfx/renderer.rs
@@ -54,7 +54,7 @@ fn draw_display_list(
     for display_list.each {|item|
         #debug["drawing %?", item];
         let (r, g, b) = alt check item.item_type {
-          dl::solid_color(r, g, b) { (r, g, b) }
+          dl::display_item_solid_color(r, g, b) { (r, g, b) }
         };
         let bounds = (*item).bounds;
 
diff --git a/src/servo/layout/display_list.rs b/src/servo/layout/display_list.rs
index 340d7470b08..81475f2bce7 100644
--- a/src/servo/layout/display_list.rs
+++ b/src/servo/layout/display_list.rs
@@ -1,7 +1,7 @@
 import gfx::geom::*;
 
 enum item_type {
-    solid_color(u8, u8, u8),
+    display_item_solid_color(u8, u8, u8),
     // FIXME: Shape code does not understand the alignment without this
     padding(u8, u8, u8, u8)
 }
diff --git a/src/servo/layout/layout.rs b/src/servo/layout/layout.rs
index c3215183607..0f92864c57a 100644
--- a/src/servo/layout/layout.rs
+++ b/src/servo/layout/layout.rs
@@ -63,9 +63,9 @@ fn build_display_list(box: @base::box) -> display_list::display_list {
 fn box_to_display_item(box: @base::box) -> dl::display_item {
     let r = rand::rng();
     let item = dl::display_item({
-        item_type: dl::solid_color(r.next() as u8,
-                                   r.next() as u8,
-                                   r.next() as u8),
+        item_type: dl::display_item_solid_color(r.next() as u8,
+                                                r.next() as u8,
+                                                r.next() as u8),
         bounds: box.bounds
     });
     #debug("layout: display item: %?", item);