diff options
author | Anthony Ramine <n.oxyde@gmail.com> | 2016-06-10 12:41:24 +0200 |
---|---|---|
committer | Anthony Ramine <n.oxyde@gmail.com> | 2016-06-10 21:51:06 +0200 |
commit | b97c7a8c4d95a63e1b967f29789cdcb9261274e1 (patch) | |
tree | 85560a0cf36b259ab309d6e30b52e782a0857441 /components/layout/layout_thread.rs | |
parent | 04b682195d2a75ad5961ec05ec1f7a1503c3f3f3 (diff) | |
download | servo-b97c7a8c4d95a63e1b967f29789cdcb9261274e1.tar.gz servo-b97c7a8c4d95a63e1b967f29789cdcb9261274e1.zip |
Don't load all font faces sources
We stop at the first one we manage to load.
Diffstat (limited to 'components/layout/layout_thread.rs')
-rw-r--r-- | components/layout/layout_thread.rs | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/components/layout/layout_thread.rs b/components/layout/layout_thread.rs index 5bef2050932..e858ac5fcee 100644 --- a/components/layout/layout_thread.rs +++ b/components/layout/layout_thread.rs @@ -358,21 +358,19 @@ fn add_font_face_rules(stylesheet: &Stylesheet, if opts::get().load_webfonts_synchronously { let (sender, receiver) = ipc::channel().unwrap(); for font_face in stylesheet.effective_rules(&device).font_face() { - for source in font_face.effective_sources() { - font_cache_thread.add_web_font(font_face.family.clone(), - (*source).clone(), - sender.clone()); - receiver.recv().unwrap(); - } + let effective_sources = font_face.effective_sources(); + font_cache_thread.add_web_font(font_face.family.clone(), + effective_sources, + sender.clone()); + receiver.recv().unwrap(); } } else { for font_face in stylesheet.effective_rules(&device).font_face() { - for source in font_face.effective_sources() { - outstanding_web_fonts_counter.fetch_add(1, Ordering::SeqCst); - font_cache_thread.add_web_font(font_face.family.clone(), - (*source).clone(), - (*font_cache_sender).clone()); - } + let effective_sources = font_face.effective_sources(); + outstanding_web_fonts_counter.fetch_add(1, Ordering::SeqCst); + font_cache_thread.add_web_font(font_face.family.clone(), + effective_sources, + (*font_cache_sender).clone()); } } } |