Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-25 16:20:36 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use keyboard-types::webdriver::send_keys

Browse source 
This improves the quality of KeyboardEvents
sent by WebDriver. Now key, code, location and
modifiers are set according to spec.
CompositionEvents are discarded as servo
does not handle them at all.
This commit is contained in:
Pyfisch 2018-11-11 21:57:45 +01:00
parent b60006ae11
commit 2143657e03
12 changed files with 30 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

13
components/webdriver_server/lib.rs
View file

@ -11,14 +11,12 @@ extern crate log;
#[macro_use]
extern crate serde;
mod keys;
use base64;
use crate::keys::keycodes_to_keys;
use euclid::TypedSize2D;
use hyper::Method;
use image::{DynamicImage, ImageFormat, RgbImage};
use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
use keyboard_types::webdriver::{send_keys, Event as KeyEvent};
use msg::constellation_msg::{BrowsingContextId, TopLevelBrowsingContextId, TraversalDirection};
use net_traits::image::base::PixelFormat;
use regex::Captures;
@ -1038,7 +1036,14 @@ impl Handler {
))
})?;
let keys = keycodes_to_keys(&keys.text);
// FIXME: Don't discard composition events.
let keys = send_keys(&keys.text)
.drain(..)
.filter_map(|event| match event {
KeyEvent::Keyboard(v) => Some(v),
_ => None,
})
.collect();
// TODO: there's a race condition caused by the focus command and the
// send keys command being two separate messages,