From ec30e97ddfc57416b50e34d3e506c8f1be66aa7e Mon Sep 17 00:00:00 2001
From: Tim Kuehn <tkuehn@cmu.edu>
Date: Mon, 29 Jul 2013 15:02:06 -0700
Subject: [PATCH] removed a call to copy in servo.rc and renamed
 NavigationContext.navigate ==> NavigationContext.load

---
 src/components/main/constellation.rs | 10 +++++-----
 src/components/main/servo.rc         |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/main/constellation.rs b/src/components/main/constellation.rs
index e5f2a99ddc0..f3fcc792526 100644
--- a/src/components/main/constellation.rs
+++ b/src/components/main/constellation.rs
@@ -177,8 +177,8 @@ impl NavigationContext {
         self.current.get()
     }
 
-    /// Navigates to a new set of page frames, returning all evicted frame trees
-    pub fn navigate(&mut self, frame_tree: @mut FrameTree) -> ~[@mut FrameTree] {
+    /// Loads a new set of page frames, returning all evicted frame trees
+    pub fn load(&mut self, frame_tree: @mut FrameTree) -> ~[@mut FrameTree] {
         debug!("navigating to %?", frame_tree);
         let evicted = replace(&mut self.next, ~[]);
         if self.current.is_some() {
@@ -627,11 +627,11 @@ impl Constellation {
             frame.pipeline.grant_paint_permission();
         }
 
-        // Don't navigate on Navigate type (or None, as in the case of parsed iframes that finish
-        // loading)
+        // Don't call navigation_context.load() on a Navigate type (or None, as in the case of
+        // parsed iframes that finish loading)
         match frame_tree.pipeline.navigation_type {
             Some(constellation_msg::Load) => {
-                let evicted = self.navigation_context.navigate(frame_tree);
+                let evicted = self.navigation_context.load(frame_tree);
                 for evicted.iter().advance |frame_tree| {
                     // exit any pipelines that don't exist outside the evicted frame trees
                     for frame_tree.iter().advance |frame| {
diff --git a/src/components/main/servo.rc b/src/components/main/servo.rc
index ea66cc356d9..5aac6b1b013 100755
--- a/src/components/main/servo.rc
+++ b/src/components/main/servo.rc
@@ -133,7 +133,7 @@ fn run(opts: &Opts) {
 
     // Send the URL command to the constellation.
     for opts.urls.iter().advance |filename| {
-        constellation_chan.send(InitLoadUrlMsg(make_url(copy *filename, None)))
+        constellation_chan.send(InitLoadUrlMsg(make_url(filename.clone(), None)))
     }
 
     // Wait for the compositor to shut down.