Bug 1349643 - Loosen thread assertion slightly. r?nical draft
authorKartikaya Gupta <kgupta@mozilla.com>
Wed, 22 Mar 2017 15:37:27 -0400
changeset 503061 6a4074319bbb12193546bd7a7288ef2b51a3863a
parent 503054 62409ff101f1582094b919b83e9f73970a3a7497
child 550330 824baa2135f4edf7033cd807d57d0b7e4abf2185
push id50476
push userkgupta@mozilla.com
push dateWed, 22 Mar 2017 19:37:55 +0000
reviewersnical
bugs1349643
milestone55.0a1
Bug 1349643 - Loosen thread assertion slightly. r?nical When changing the webrender profiler enabled/disabled state, the change propagates to webrender via the main thread. This violates a thread assertion. However, the thread assertion is mostly for documentation, so we can loosen it a little to allow for this scenario. MozReview-Commit-ID: FHEqc2szttH
gfx/webrender_bindings/src/bindings.rs
--- a/gfx/webrender_bindings/src/bindings.rs
+++ b/gfx/webrender_bindings/src/bindings.rs
@@ -877,17 +877,17 @@ pub unsafe extern "C" fn wr_api_clear_ro
 
 #[no_mangle]
 pub extern "C" fn wr_api_generate_frame(api: &mut RenderApi) {
     api.generate_frame(None);
 }
 
 #[no_mangle]
 pub extern "C" fn wr_api_send_external_event(api: &mut RenderApi, evt: usize) {
-    assert!(unsafe { is_in_compositor_thread() });
+    assert!(unsafe { !is_in_render_thread() });
 
     api.send_external_event(ExternalEvent::from_raw(evt));
 }
 
 #[no_mangle]
 pub extern "C" fn wr_api_add_raw_font(api: &mut RenderApi,
                                       key: FontKey,
                                       font_buffer: *mut u8,