Bug 1405790 - Fix for ClipId change in WR cset b4fbc86. r?jrmuizel draft
authorKartikaya Gupta <kgupta@mozilla.com>
Tue, 10 Oct 2017 08:06:51 -0400
changeset 677250 db1e236ee5a563af7354e34ba81b38211c022402
parent 677249 ec2ec418bb355ccfedf3e3201c08909666420e49
child 677251 ea4e5a4e52ee8198b1a17768087a41e5edd79257
push id83735
push userkgupta@mozilla.com
push dateTue, 10 Oct 2017 12:16:32 +0000
reviewersjrmuizel
bugs1405790
milestone58.0a1
Bug 1405790 - Fix for ClipId change in WR cset b4fbc86. r?jrmuizel MozReview-Commit-ID: 1MOrMCx8eVF
gfx/webrender_bindings/src/bindings.rs
--- a/gfx/webrender_bindings/src/bindings.rs
+++ b/gfx/webrender_bindings/src/bindings.rs
@@ -1201,30 +1201,29 @@ pub extern "C" fn wr_dp_define_clip(stat
     debug_assert!(unsafe { is_in_main_thread() });
     let complex_slice = make_slice(complex, complex_count);
     let complex_iter = complex_slice.iter().cloned();
     let mask : Option<ImageMask> = unsafe { mask.as_ref() }.map(|x| x.into());
 
     let clip_id = state.frame_builder.dl_builder.define_clip(None, clip_rect, complex_iter, mask);
     // return the u64 id value from inside the ClipId::Clip(..)
     match clip_id {
-        ClipId::Clip(id, nesting_index, pipeline_id) => {
+        ClipId::Clip(id, pipeline_id) => {
             assert!(pipeline_id == state.pipeline_id);
-            assert!(nesting_index == 0);
             id
         },
         _ => panic!("Got unexpected clip id type"),
     }
 }
 
 #[no_mangle]
 pub extern "C" fn wr_dp_push_clip(state: &mut WrState,
                                   clip_id: u64) {
     debug_assert!(unsafe { is_in_main_thread() });
-    state.frame_builder.dl_builder.push_clip_id(ClipId::Clip(clip_id, 0, state.pipeline_id));
+    state.frame_builder.dl_builder.push_clip_id(ClipId::Clip(clip_id, state.pipeline_id));
 }
 
 #[no_mangle]
 pub extern "C" fn wr_dp_pop_clip(state: &mut WrState) {
     debug_assert!(unsafe { !is_in_render_thread() });
     state.frame_builder.dl_builder.pop_clip_id();
 }
 
@@ -1239,19 +1238,18 @@ pub extern "C" fn wr_dp_define_sticky_fr
     assert!(unsafe { is_in_main_thread() });
     let clip_id = state.frame_builder.dl_builder.define_sticky_frame(
         None, content_rect, StickyFrameInfo::new(
             unsafe { top_range.as_ref() }.cloned(),
             unsafe { right_range.as_ref() }.cloned(),
             unsafe { bottom_range.as_ref() }.cloned(),
             unsafe { left_range.as_ref() }.cloned()));
     match clip_id {
-        ClipId::Clip(id, nesting_index, pipeline_id) => {
+        ClipId::Clip(id, pipeline_id) => {
             assert!(pipeline_id == state.pipeline_id);
-            assert!(nesting_index == 0);
             id
         },
         _ => panic!("Got unexpected clip id type"),
     }
 }
 
 #[no_mangle]
 pub extern "C" fn wr_dp_define_scroll_layer(state: &mut WrState,
@@ -1293,17 +1291,17 @@ pub extern "C" fn wr_scroll_layer_with_i
 pub extern "C" fn wr_dp_push_clip_and_scroll_info(state: &mut WrState,
                                                   scroll_id: u64,
                                                   clip_id: *const u64) {
     debug_assert!(unsafe { is_in_main_thread() });
     let scroll_id = ClipId::new(scroll_id, state.pipeline_id);
     let info = if let Some(&id) = unsafe { clip_id.as_ref() } {
         ClipAndScrollInfo::new(
             scroll_id,
-            ClipId::Clip(id, 0, state.pipeline_id))
+            ClipId::Clip(id, state.pipeline_id))
     } else {
         ClipAndScrollInfo::simple(scroll_id)
     };
     state.frame_builder.dl_builder.push_clip_and_scroll_info(info);
 }
 
 #[no_mangle]
 pub extern "C" fn wr_dp_pop_clip_and_scroll_info(state: &mut WrState) {