mirror of
https://github.com/servo/servo.git
synced 2025-08-06 14:10:11 +01:00
Upgrade to the latest version of WebRender
This commit is contained in:
parent
4b6e79337e
commit
e58e8ab42e
88 changed files with 554 additions and 521 deletions
|
@ -27,4 +27,4 @@ servo_config = {path = "../config"}
|
|||
servo_url = {path = "../url"}
|
||||
url = {version = "1.2", features = ["heap_size"]}
|
||||
uuid = {version = "0.5", features = ["v4", "serde"]}
|
||||
webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]}
|
||||
webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
use ipc_channel::ipc::IpcSharedMemory;
|
||||
use piston_image::{self, DynamicImage, ImageFormat};
|
||||
use std::fmt;
|
||||
use webrender_traits;
|
||||
use webrender_api;
|
||||
|
||||
#[derive(Clone, Copy, Debug, Deserialize, Eq, PartialEq, Serialize, HeapSizeOf)]
|
||||
pub enum PixelFormat {
|
||||
|
@ -26,8 +26,8 @@ pub struct Image {
|
|||
pub format: PixelFormat,
|
||||
#[ignore_heap_size_of = "Defined in ipc-channel"]
|
||||
pub bytes: IpcSharedMemory,
|
||||
#[ignore_heap_size_of = "Defined in webrender_traits"]
|
||||
pub id: Option<webrender_traits::ImageKey>,
|
||||
#[ignore_heap_size_of = "Defined in webrender_api"]
|
||||
pub id: Option<webrender_api::ImageKey>,
|
||||
}
|
||||
|
||||
impl fmt::Debug for Image {
|
||||
|
|
|
@ -7,7 +7,7 @@ use image::base::{Image, ImageMetadata};
|
|||
use ipc_channel::ipc::IpcSender;
|
||||
use servo_url::ServoUrl;
|
||||
use std::sync::Arc;
|
||||
use webrender_traits;
|
||||
use webrender_api;
|
||||
|
||||
// ======================================================================
|
||||
// Aux structs and enums.
|
||||
|
@ -101,7 +101,7 @@ pub enum UsePlaceholder {
|
|||
// ======================================================================
|
||||
|
||||
pub trait ImageCache: Sync + Send {
|
||||
fn new(webrender_api: webrender_traits::RenderApi) -> Self where Self: Sized;
|
||||
fn new(webrender_api: webrender_api::RenderApi) -> Self where Self: Sized;
|
||||
|
||||
/// Return any available metadata or image for the given URL,
|
||||
/// or an indication that the image is not yet available if it is in progress,
|
||||
|
|
|
@ -23,7 +23,7 @@ extern crate servo_config;
|
|||
extern crate servo_url;
|
||||
extern crate url;
|
||||
extern crate uuid;
|
||||
extern crate webrender_traits;
|
||||
extern crate webrender_api;
|
||||
|
||||
use cookie_rs::Cookie;
|
||||
use filemanager_thread::FileManagerThreadMsg;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue