Bug 1349692 - Update webrender_bindings. r?jrmuizel draft
authorKartikaya Gupta <kgupta@mozilla.com>
Tue, 28 Mar 2017 15:23:41 -0400
changeset 552605 83bdae77243cb58608d130cb5a6a0aa3080cdbf8
parent 552604 e8070bd4cb1f9f1aa48791901b9a16ebaabff8d9
child 552606 15faa0756e44e7b010f11b28f1b3ca57f64ebf1b
push id51407
push userkgupta@mozilla.com
push dateTue, 28 Mar 2017 19:25:45 +0000
reviewersjrmuizel
bugs1349692
milestone55.0a1
Bug 1349692 - Update webrender_bindings. r?jrmuizel - API changes to update_image and push_stacking_context. - Bump versions in Cargo.toml MozReview-Commit-ID: BtseqZMfWKV
gfx/webrender_bindings/Cargo.toml
gfx/webrender_bindings/src/bindings.rs
--- a/gfx/webrender_bindings/Cargo.toml
+++ b/gfx/webrender_bindings/Cargo.toml
@@ -1,16 +1,16 @@
 [package]
 name = "webrender_bindings"
 version = "0.1.0"
 authors = ["The Mozilla Project Developers"]
 license = "MPL-2.0"
 
 [dependencies]
-webrender_traits = {path = "../webrender_traits", version = "0.26.0"}
+webrender_traits = {path = "../webrender_traits", version = "0.27.0"}
 euclid = "0.11"
 app_units = "0.4"
 gleam = "0.4"
 
 [dependencies.webrender]
 path = "../webrender"
-version = "0.25.0"
+version = "0.26.0"
 default-features = false
--- a/gfx/webrender_bindings/src/bindings.rs
+++ b/gfx/webrender_bindings/src/bindings.rs
@@ -849,17 +849,17 @@ pub extern "C" fn wr_api_add_external_im
 #[no_mangle]
 pub extern "C" fn wr_api_update_image(api: &mut RenderApi,
                                       key: ImageKey,
                                       descriptor: &WrImageDescriptor,
                                       bytes: ByteSlice) {
     assert!(unsafe { is_in_compositor_thread() });
     let copied_bytes = bytes.as_slice().to_owned();
 
-    api.update_image(key, descriptor.to_descriptor(), copied_bytes);
+    api.update_image(key, descriptor.to_descriptor(), copied_bytes, None);
 }
 
 #[no_mangle]
 pub extern "C" fn wr_api_delete_image(api: &mut RenderApi, key: ImageKey) {
     assert!(unsafe { is_in_compositor_thread() });
     api.delete_image(key)
 }
 
@@ -1022,17 +1022,16 @@ pub extern "C" fn wr_dp_begin(state: &mu
 
     let bounds = LayoutRect::new(LayoutPoint::new(0.0, 0.0),
                                  LayoutSize::new(width as f32, height as f32));
 
     state.frame_builder
         .dl_builder
         .push_stacking_context(webrender_traits::ScrollPolicy::Scrollable,
                                bounds,
-                               ClipRegion::simple(&bounds),
                                0,
                                None,
                                None,
                                webrender_traits::MixBlendMode::Normal,
                                Vec::new());
 }
 
 #[no_mangle]
@@ -1083,29 +1082,27 @@ pub extern "C" fn wr_dp_push_stacking_co
             ImageMask {
                 image: image,
                 rect: rect.to_rect(),
                 repeat: repeat,
             }
         })
     };
 
-    let clip_region2 = state.frame_builder.dl_builder.new_clip_region(&overflow, vec![], None);
     let clip_region = state.frame_builder.dl_builder.new_clip_region(&overflow, vec![], mask);
 
     let mut filters: Vec<FilterOp> = Vec::new();
     if opacity < 1.0 {
         filters.push(FilterOp::Opacity(PropertyBinding::Value(opacity)));
     }
 
     state.frame_builder
         .dl_builder
         .push_stacking_context(webrender_traits::ScrollPolicy::Scrollable,
                                bounds,
-                               clip_region2,
                                state.z_index,
                                Some(PropertyBinding::Value(*transform)),
                                None,
                                mix_blend_mode,
                                filters);
     state.frame_builder.dl_builder.push_scroll_layer(clip_region, bounds.size, None);
 }