Auto merge of #13322 - jdm:msvc-build-fix, r=KiChjang

Make dummy font implementation conform to API changes.

- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #13321
- [X] There are tests for these changes

<!-- 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/13322)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-09-19 15:37:16 -05:00 committed by GitHub
commit 7d3c7beb21

View file

@ -2,6 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use std::io::Error;
use string_cache::Atom;
use webrender_traits::NativeFontHandle;
@ -12,7 +13,7 @@ pub struct FontTemplateData {
}
impl FontTemplateData {
pub fn new(identifier: Atom, font_data: Option<Vec<u8>>) -> FontTemplateData {
pub fn new(identifier: Atom, font_data: Option<Vec<u8>>) -> Result<FontTemplateData, Error> {
let bytes = match font_data {
Some(bytes) => {
bytes
@ -22,10 +23,10 @@ impl FontTemplateData {
}
};
FontTemplateData {
Ok(FontTemplateData {
bytes: bytes,
identifier: identifier,
}
})
}
pub fn bytes(&self) -> Vec<u8> {
self.bytes.clone()