diff options
author | Connor Brewster <brewsterc@my.caspercollege.edu> | 2016-06-07 22:09:45 -0600 |
---|---|---|
committer | Connor Brewster <connor.brewster@eagles.oc.edu> | 2016-07-21 20:51:38 -0600 |
commit | f13181876317c5d2e690dc4d0a5d10185eda1101 (patch) | |
tree | 070202b024ea55017ddb2ccc87d27eb44c9a9149 /components/webdriver_server/lib.rs | |
parent | 4ae0897175143351439ff5b903d05a79c17e3725 (diff) | |
download | servo-f13181876317c5d2e690dc4d0a5d10185eda1101.tar.gz servo-f13181876317c5d2e690dc4d0a5d10185eda1101.zip |
Implement beginnings of joint session history
Fix backward navigation
make use of history iterator
Add frame iterator
add different back logic
cleanup navigation_info
Add extra explanation for iter logic
Remove forward history on full frame tree
Rename navigation to traversal where appropriate
check full tree for can go back/forward
simplify frame iter logic
remove FrameIterator
cleanup history iter
reduce amount of vec allocations
removed extra parenthesis
Remove history iterator
cleanup after rebasing
avoid recursive vec allocation
remove full_frame_tree
remove_forward_history_in_frame_tree -> clear_joint_session_future
Diffstat (limited to 'components/webdriver_server/lib.rs')
-rw-r--r-- | components/webdriver_server/lib.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/webdriver_server/lib.rs b/components/webdriver_server/lib.rs index 5e862f36d9d..050cb68b639 100644 --- a/components/webdriver_server/lib.rs +++ b/components/webdriver_server/lib.rs @@ -32,7 +32,7 @@ use image::{DynamicImage, ImageFormat, RgbImage}; use ipc_channel::ipc::{self, IpcReceiver, IpcSender}; use keys::keycodes_to_keys; use msg::constellation_msg::{FrameId, LoadData, PipelineId}; -use msg::constellation_msg::{NavigationDirection, PixelFormat}; +use msg::constellation_msg::{TraversalDirection, PixelFormat}; use regex::Captures; use rustc_serialize::base64::{CharacterSet, Config, Newline, ToBase64}; use rustc_serialize::json::{Json, ToJson}; @@ -440,12 +440,12 @@ impl Handler { } fn handle_go_back(&self) -> WebDriverResult<WebDriverResponse> { - self.constellation_chan.send(ConstellationMsg::Navigate(None, NavigationDirection::Back(1))).unwrap(); + self.constellation_chan.send(ConstellationMsg::TraverseHistory(None, TraversalDirection::Back(1))).unwrap(); Ok(WebDriverResponse::Void) } fn handle_go_forward(&self) -> WebDriverResult<WebDriverResponse> { - self.constellation_chan.send(ConstellationMsg::Navigate(None, NavigationDirection::Forward(1))).unwrap(); + self.constellation_chan.send(ConstellationMsg::TraverseHistory(None, TraversalDirection::Forward(1))).unwrap(); Ok(WebDriverResponse::Void) } |