Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Replace use of rustc_serialize::base64 by base64

Browse source
This commit is contained in:
Anthony Ramine 2017-03-26 14:15:31 +02:00
parent c2d9f663af
commit 0ed4df28b5
12 changed files with 30 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

1
components/webdriver_server/Cargo.toml
View file

@ -10,6 +10,7 @@ name = "webdriver_server"
path = "lib.rs"
[dependencies]
base64 = "0.4.1"
cookie = "0.2.5"
euclid = "0.11"
hyper = "0.9.9"

10
components/webdriver_server/lib.rs
View file

@ -7,6 +7,7 @@
#![deny(unsafe_code)]
extern crate base64;
extern crate cookie as cookie_rs;
extern crate euclid;
extern crate hyper;
@ -34,7 +35,6 @@ use keys::keycodes_to_keys;
use msg::constellation_msg::{FrameId, PipelineId, TraversalDirection};
use net_traits::image::base::PixelFormat;
use regex::Captures;
use rustc_serialize::base64::{CharacterSet, Config, Newline, ToBase64};
use rustc_serialize::json::{Json, ToJson};
use script_traits::{ConstellationMsg, LoadData, WebDriverCommandMsg};
use script_traits::webdriver_msg::{LoadStatus, WebDriverCookieError, WebDriverFrameId};
@ -831,13 +831,7 @@ impl Handler {
let mut png_data = Vec::new();
DynamicImage::ImageRgb8(rgb).save(&mut png_data, ImageFormat::PNG).unwrap();
let config = Config {
char_set: CharacterSet::Standard,
newline: Newline::LF,
pad: true,
line_length: None
};
let encoded = png_data.to_base64(config);
let encoded = base64::encode(&png_data);
Ok(WebDriverResponse::Generic(ValueResponse::new(encoded.to_json())))
}