From 8ea3faac03abc1a6b6a49a2d132c4f782ee3a7f2 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Fri, 4 May 2012 19:17:35 -0700
Subject: [PATCH] Rename int_to_au to px_to_au, etc.

---
 src/servo/gfx/geom.rs            | 4 ++--
 src/servo/gfx/renderer.rs        | 8 ++++----
 src/servo/layout/layout.rs       | 2 +-
 src/servo/parser/html_builder.rs | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/servo/gfx/geom.rs b/src/servo/gfx/geom.rs
index 1516e6fcbaa..a6b5aa68d7b 100644
--- a/src/servo/gfx/geom.rs
+++ b/src/servo/gfx/geom.rs
@@ -29,10 +29,10 @@ fn zero_rect_au() -> rect<au> {
     {mut origin: point(z, z), mut size: size(z, z)}
 }
 
-fn int_to_au(i: int) -> au {
+fn px_to_au(i: int) -> au {
     au(i * 60)
 }
 
-fn au_to_int(au: au) -> int {
+fn au_to_px(au: au) -> int {
     *au / 60
 }
\ No newline at end of file
diff --git a/src/servo/gfx/renderer.rs b/src/servo/gfx/renderer.rs
index 2a3ef9d991d..65cf7405e6b 100644
--- a/src/servo/gfx/renderer.rs
+++ b/src/servo/gfx/renderer.rs
@@ -61,10 +61,10 @@ fn draw_display_list(
         let red_pattern = AzCreateColorPattern(ptr::addr_of(red_color));
 
         let red_rect = {
-            x: au_to_int(bounds.origin.x) as AzFloat,
-            y: au_to_int(bounds.origin.y) as AzFloat,
-            width: au_to_int(bounds.size.width) as AzFloat,
-            height: au_to_int(bounds.size.height) as AzFloat
+            x: au_to_px(bounds.origin.x) as AzFloat,
+            y: au_to_px(bounds.origin.y) as AzFloat,
+            width: au_to_px(bounds.size.width) as AzFloat,
+            height: au_to_px(bounds.size.height) as AzFloat
         };
         AzDrawTargetFillRect(
             draw_target,
diff --git a/src/servo/layout/layout.rs b/src/servo/layout/layout.rs
index e4fe2e5ac60..db26b0ee3ad 100644
--- a/src/servo/layout/layout.rs
+++ b/src/servo/layout/layout.rs
@@ -29,7 +29,7 @@ fn layout(to_renderer: chan<renderer::msg>) -> chan<msg> {
               build(node) {
                 #debug("layout: received layout request");
                 let box = linked_subtree(node);
-                base::reflow_block(box, geom::int_to_au(800));
+                base::reflow_block(box, geom::px_to_au(800));
                 let dlist = build_display_list(box);
                 to_renderer.send(renderer::render(dlist));
               }
diff --git a/src/servo/parser/html_builder.rs b/src/servo/parser/html_builder.rs
index 464f021bb74..013f26bee7e 100644
--- a/src/servo/parser/html_builder.rs
+++ b/src/servo/parser/html_builder.rs
@@ -26,8 +26,8 @@ fn build_dom(scope: dom::node_scope,
             parser::to_start_tag("img") {
                 #debug["IMG"];
                 let new_node = scope.new_node(
-                    dom::nk_img({mut width: geom::int_to_au(100),
-                                 mut height: geom::int_to_au(100)}));
+                    dom::nk_img({mut width: geom::px_to_au(100),
+                                 mut height: geom::px_to_au(100)}));
                 scope.add_child(cur, new_node);
                 cur = new_node;
             }