Auto merge of #17694 - glennw:webrender-update, r=glennw

Upgrade to the latest version of WebRender

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17694)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-07-12 21:52:27 -07:00 committed by GitHub
commit 173181a491
88 changed files with 554 additions and 521 deletions

View file

@ -5,7 +5,7 @@
use servo_atoms::Atom;
use std::fs::File;
use std::io::{Read, Error};
use webrender_traits::NativeFontHandle;
use webrender_api::NativeFontHandle;
/// Platform specific font representation for Linux.
/// The identifier is an absolute path, and the bytes

View file

@ -18,7 +18,7 @@ use std::fs::File;
use std::io::{Read, Error as IoError};
use std::ops::Deref;
use std::sync::Mutex;
use webrender_traits::NativeFontHandle;
use webrender_api::NativeFontHandle;
/// Platform specific font representation for mac.
/// The identifier is a PostScript font name. The

View file

@ -5,7 +5,7 @@
use platform::windows::font_list::{descriptor_from_atom, font_from_atom};
use servo_atoms::Atom;
use std::io;
use webrender_traits::NativeFontHandle;
use webrender_api::NativeFontHandle;
#[derive(Deserialize, Serialize, Debug)]
pub struct FontTemplateData {