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

Auto merge of #25863 - servo:synup, r=jdm

Browse source 
Remove syn 0.15 from our crate graph
This commit is contained in:
bors-servo 2020-03-05 10:03:48 -05:00 • committed by GitHub
commit 813be91926
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
61 changed files with 219 additions and 187 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/script/Cargo.toml
View file

@ -58,7 +58,7 @@ html5ever = "0.25"
http = "0.1"
hyper = "0.12"
hyper_serde = "0.11"
image = "0.22"
image = "0.23"
indexmap = "1.0.2"
ipc-channel = "0.14"
itertools = "0.8"

2
components/script/dom/htmlcanvaselement.rs
View file

@ -392,7 +392,7 @@ impl HTMLCanvasElementMethods for HTMLCanvasElement {
// FIXME(nox): https://github.com/PistonDevelopers/image-png/issues/86
// FIXME(nox): https://github.com/PistonDevelopers/image-png/issues/87
PNGEncoder::new(&mut png)
.encode(&file, self.Width(), self.Height(), ColorType::RGBA(8))
.encode(&file, self.Width(), self.Height(), ColorType::Rgba8)
.unwrap();
let mut url = "data:image/png;base64,".to_owned();
// FIXME(nox): Should this use base64::URL_SAFE?

6
components/script/dom/htmlmediaelement.rs
View file

@ -96,7 +96,8 @@ use std::rc::Rc;
use std::sync::{Arc, Mutex};
use time::{self, Duration, Timespec};
use webrender_api::{ExternalImageData, ExternalImageId, ExternalImageType, TextureTarget};
use webrender_api::{ImageData, ImageDescriptor, ImageFormat, ImageKey, Transaction};
use webrender_api::{ImageData, ImageDescriptor, ImageDescriptorFlags, ImageFormat};
use webrender_api::{ImageKey, Transaction};
#[derive(PartialEq)]
enum FrameStatus {
@ -186,8 +187,7 @@ impl VideoFrameRenderer for MediaFrameRenderer {
frame.get_width(),
frame.get_height(),
ImageFormat::BGRA8,
false,
false,
ImageDescriptorFlags::empty(),
);
match self.current_frame {