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 #18981 - KiChjang:fold-type-destination, r=avadacatavra

Browse source 
Merge request type and destination

Fixes #18278.

<!-- 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/18981)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-10-24 17:02:18 -05:00 • committed by GitHub
commit dcd7d2fa32
20 changed files with 88 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/gfx/font_cache_thread.rs
View file

@ -7,7 +7,7 @@ use font_template::{FontTemplate, FontTemplateDescriptor};
use fontsan;
use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
use net_traits::{CoreResourceThread, FetchResponseMsg, fetch_async};
use net_traits::request::{Destination, RequestInit, Type as RequestType};
use net_traits::request::{Destination, RequestInit};
use platform::font_context::FontContextHandle;
use platform::font_list::SANS_SERIF_FONT_FAMILY;
use platform::font_list::for_each_available_family;
@ -237,7 +237,6 @@ impl FontCache {
let request = RequestInit {
url: url.clone(),
type_: RequestType::Font,
destination: Destination::Font,
// TODO: Add a proper origin - Can't import GlobalScope from gfx
// We can leave origin to be set by default