Upgrade to the latest version of WebRender

This commit is contained in:
Martin Robinson 2017-07-06 19:21:22 +02:00 committed by Glenn Watson
parent 4b6e79337e
commit e58e8ab42e
88 changed files with 554 additions and 521 deletions

View file

@ -14,4 +14,4 @@ bitflags = "0.7"
heapsize = "0.4"
heapsize_derive = "0.1"
serde = "1.0"
webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]}
webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}

View file

@ -7,7 +7,7 @@
use std::cell::Cell;
use std::fmt;
use webrender_traits;
use webrender_api;
#[derive(PartialEq, Eq, Copy, Clone, Debug, Deserialize, Serialize)]
pub enum KeyState {
@ -239,14 +239,14 @@ impl PipelineId {
})
}
pub fn to_webrender(&self) -> webrender_traits::PipelineId {
pub fn to_webrender(&self) -> webrender_api::PipelineId {
let PipelineNamespaceId(namespace_id) = self.namespace_id;
let PipelineIndex(index) = self.index;
webrender_traits::PipelineId(namespace_id, index)
webrender_api::PipelineId(namespace_id, index)
}
pub fn root_scroll_node(&self) -> webrender_traits::ClipId {
webrender_traits::ClipId::root_scroll_node(self.to_webrender())
pub fn root_scroll_node(&self) -> webrender_api::ClipId {
webrender_api::ClipId::root_scroll_node(self.to_webrender())
}
}

View file

@ -9,6 +9,6 @@ extern crate bitflags;
extern crate heapsize;
#[macro_use] extern crate heapsize_derive;
#[macro_use] extern crate serde;
extern crate webrender_traits;
extern crate webrender_api;
pub mod constellation_msg;