Revert "script: Use atom comparison in more places, especially for attributes." for persistent test failures.

This reverts commit 874db261046d6155b1942efa106d2e0014295d6d.

1 files changed, 4 insertions, 5 deletions

diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs
index d423cfc1555..4ff04389836 100644
--- a/components/layout/fragment.rs
+++ b/components/layout/fragment.rs
@@ -39,7 +39,6 @@ use serialize::{Encodable, Encoder};
 use servo_msg::constellation_msg::{ConstellationChan, FrameRectMsg, PipelineId, SubpageId};
 use servo_net::image::holder::ImageHolder;
 use servo_net::local_image_cache::LocalImageCache;
-use servo_util::atom::Atom;
 use servo_util::geometry::Au;
 use servo_util::geometry;
 use servo_util::logical_geometry::{LogicalRect, LogicalSize, LogicalMargin};
@@ -175,7 +174,7 @@ impl ImageFragmentInfo {
                image_url: Url,
                local_image_cache: Arc<Mutex<LocalImageCache>>)
                -> ImageFragmentInfo {
-        fn convert_length(node: &ThreadSafeLayoutNode, name: &Atom) -> Option<Au> {
+        fn convert_length(node: &ThreadSafeLayoutNode, name: &str) -> Option<Au> {
             let element = node.as_element();
             element.get_attr(&namespace::Null, name).and_then(|string| {
                 let n: Option<int> = FromStr::from_str(string);
@@ -184,8 +183,8 @@ impl ImageFragmentInfo {
         }
 
         let is_vertical = node.style().writing_mode.is_vertical();
-        let dom_width = convert_length(node, &satom!("width"));
-        let dom_height = convert_length(node, &satom!("height"));
+        let dom_width = convert_length(node, "width");
+        let dom_height = convert_length(node, "height");
         ImageFragmentInfo {
             image: ImageHolder::new(image_url, local_image_cache),
             computed_inline_size: None,
@@ -338,7 +337,7 @@ impl TableColumnFragmentInfo {
     pub fn new(node: &ThreadSafeLayoutNode) -> TableColumnFragmentInfo {
         let span = {
             let element = node.as_element();
-            element.get_attr(&namespace::Null, &satom!("span")).and_then(|string| {
+            element.get_attr(&namespace::Null, "span").and_then(|string| {
                 let n: Option<int> = FromStr::from_str(string);
                 n
             })