Bug 1373381 - Update for NestingIndex change in WR cset 229cf3a. r=mrobinson
authorKartikaya Gupta <kgupta@mozilla.com>
Tue, 20 Jun 2017 09:38:51 -0400
changeset 365087 e6261af4646637ae69cd5231e3d7a69cd75c74bb
parent 365086 9d65d68d9e5c7d83ec9116384635ed6c3f87e49a
child 365088 294e356f81e8a1b1b14c4146e81cee56f927173f
push id91680
push userkwierso@gmail.com
push dateWed, 21 Jun 2017 01:32:01 +0000
treeherdermozilla-inbound@f7b9dc31956c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmrobinson
bugs1373381
milestone56.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1373381 - Update for NestingIndex change in WR cset 229cf3a. r=mrobinson MozReview-Commit-ID: CK2andK4v6I
gfx/webrender_bindings/src/bindings.rs
--- a/gfx/webrender_bindings/src/bindings.rs
+++ b/gfx/webrender_bindings/src/bindings.rs
@@ -1378,18 +1378,19 @@ pub extern "C" fn wr_dp_push_clip(state:
         m.rect.origin = m.rect.origin - content_rect.origin.to_vector();
     }
 
     let clip_region = state.frame_builder.dl_builder.push_clip_region(&clip_rect, vec![], mask);
     let clip_id = state.frame_builder.dl_builder.define_clip(content_rect, clip_region, None);
     state.frame_builder.dl_builder.push_clip_id(clip_id);
     // return the u64 id value from inside the ClipId::Clip(..)
     match clip_id {
-        ClipId::Clip(id, pipeline_id) => {
+        ClipId::Clip(id, nesting_index, 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_pop_clip(state: &mut WrState) {
@@ -1442,17 +1443,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) {
     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, state.pipeline_id))
+            ClipId::Clip(id, 0, 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) {