diff options
author | David Raifaizen <d-raif@hotmail.com> | 2016-07-25 20:34:47 -0400 |
---|---|---|
committer | David Raifaizen <d-raif@hotmail.com> | 2016-07-25 22:28:04 -0400 |
commit | 2475dc1d21343e7cdda8b77be87be4484ee0f15a (patch) | |
tree | b1a1230b9bfd48d1e85598286061c0d48ed4e755 /components/webdriver_server/lib.rs | |
parent | 4b78b9adab916cc4fdde6248e785030b79f406da (diff) | |
download | servo-2475dc1d21343e7cdda8b77be87be4484ee0f15a.tar.gz servo-2475dc1d21343e7cdda8b77be87be4484ee0f15a.zip |
Removed some sources of panic from script thread and devtools, using Option values instead to indicate when a pipeline context is missing where appropriate. Additionally, removed erroneous method get_browsing_context.
Diffstat (limited to 'components/webdriver_server/lib.rs')
-rw-r--r-- | components/webdriver_server/lib.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/components/webdriver_server/lib.rs b/components/webdriver_server/lib.rs index 5e862f36d9d..5f5c0d59411 100644 --- a/components/webdriver_server/lib.rs +++ b/components/webdriver_server/lib.rs @@ -738,7 +738,9 @@ impl Handler { Ok(value) => Ok(WebDriverResponse::Generic(ValueResponse::new(value.to_json()))), Err(WebDriverJSError::Timeout) => Err(WebDriverError::new(ErrorStatus::Timeout, "")), Err(WebDriverJSError::UnknownType) => Err(WebDriverError::new( - ErrorStatus::UnsupportedOperation, "Unsupported return type")) + ErrorStatus::UnsupportedOperation, "Unsupported return type")), + Err(WebDriverJSError::BrowsingContextNotFound) => Err(WebDriverError::new( + ErrorStatus::JavascriptError, "Pipeline id not found in browsing context")) } } |