Load web fonts synchronously during wpt.

1 files changed, 12 insertions, 4 deletions

diff --git a/components/layout/layout_task.rs b/components/layout/layout_task.rs
index c86ecdedaff..7a615b02f6b 100644
--- a/components/layout/layout_task.rs
+++ b/components/layout/layout_task.rs
@@ -326,10 +326,18 @@ fn add_font_face_rules(stylesheet: &Stylesheet,
                        outstanding_web_fonts_counter: &Arc<AtomicUsize>) {
     for font_face in stylesheet.effective_rules(&device).font_face() {
         for source in &font_face.sources {
-            outstanding_web_fonts_counter.fetch_add(1, Ordering::SeqCst);
-            font_cache_task.add_web_font(font_face.family.clone(),
-                                         (*source).clone(),
-                                         (*font_cache_sender).clone());
+            if opts::get().load_webfonts_synchronously {
+                let (sender, receiver) = channel();
+                font_cache_task.add_web_font(font_face.family.clone(),
+                                             (*source).clone(),
+                                             sender);
+                receiver.recv().unwrap();
+            } else {
+                outstanding_web_fonts_counter.fetch_add(1, Ordering::SeqCst);
+                font_cache_task.add_web_font(font_face.family.clone(),
+                                             (*source).clone(),
+                                             (*font_cache_sender).clone());
+            }
         }
     }
 }