Auto merge of #11049 - asajeffrey:webdriver-delete-session, r=jgraham

bors-servo · bors-servo · commit 0c673ef3a2ad · 2016-05-10T11:05:12.000-07:00
Added webdriver delete session command. Delete session is needed by the web platform test `webdriver/navigation.py`.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11049)
diff --git a/components/webdriver_server/lib.rs b/components/webdriver_server/lib.rs
@@ -299,6 +299,11 @@ impl Handler {
         }
     }
 
+    fn handle_delete_session(&mut self) -> WebDriverResult<WebDriverResponse> {
+        self.session = None;
+        Ok(WebDriverResponse::Void)
+    }
+
     #[inline]
     fn frame_script_command(&self, cmd_msg: WebDriverScriptCommand) -> WebDriverResult<()> {
         Ok(self.constellation_chan.send(ConstellationMsg::WebDriverCommand(
@@ -767,6 +772,7 @@ impl WebDriverHandler<ServoExtensionRoute> for Handler {
 
         match msg.command {
             WebDriverCommand::NewSession => self.handle_new_session(),
+            WebDriverCommand::DeleteSession => self.handle_delete_session(),
             WebDriverCommand::Get(ref parameters) => self.handle_get(parameters),
             WebDriverCommand::GetCurrentUrl => self.handle_current_url(),
             WebDriverCommand::GetWindowSize => self.handle_window_size(),
@@ -809,6 +815,8 @@ impl WebDriverHandler<ServoExtensionRoute> for Handler {
     }
 
     fn delete_session(&mut self, _session: &Option<Session>) {
+        // Servo doesn't support multiple sessions, so we exit on session deletion
+        let _ = self.constellation_chan.send(ConstellationMsg::Exit);
         self.session = None;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -299,6 +299,11 @@ impl Handler {`
`299`	`299`	`}`
`300`	`300`	`}`
`301`	`301`
	`302`	`+ fn handle_delete_session(&mut self) -> WebDriverResult<WebDriverResponse> {`
	`303`	`+ self.session = None;`
	`304`	`+ Ok(WebDriverResponse::Void)`
	`305`	`+ }`
	`306`	`+`
`302`	`307`	`#[inline]`
`303`	`308`	`fn frame_script_command(&self, cmd_msg: WebDriverScriptCommand) -> WebDriverResult<()> {`
`304`	`309`	`Ok(self.constellation_chan.send(ConstellationMsg::WebDriverCommand(`
`@@ -767,6 +772,7 @@ impl WebDriverHandler<ServoExtensionRoute> for Handler {`
`767`	`772`
`768`	`773`	`match msg.command {`
`769`	`774`	`WebDriverCommand::NewSession => self.handle_new_session(),`
	`775`	`+ WebDriverCommand::DeleteSession => self.handle_delete_session(),`
`770`	`776`	`WebDriverCommand::Get(ref parameters) => self.handle_get(parameters),`
`771`	`777`	`WebDriverCommand::GetCurrentUrl => self.handle_current_url(),`
`772`	`778`	`WebDriverCommand::GetWindowSize => self.handle_window_size(),`
`@@ -809,6 +815,8 @@ impl WebDriverHandler<ServoExtensionRoute> for Handler {`
`809`	`815`	`}`
`810`	`816`
`811`	`817`	`fn delete_session(&mut self, _session: &Option<Session>) {`
	`818`	`+ // Servo doesn't support multiple sessions, so we exit on session deletion`
	`819`	`+ let _ = self.constellation_chan.send(ConstellationMsg::Exit);`
`812`	`820`	`self.session = None;`
`813`	`821`	`}`
`814`	`822`	`}`