update deps

switch to using webrender_traits::ImageData

update use of webrender_traits::StackingContext in layout

use webrender_traits::channel::msg_channel in webgl ipc

fix use of resource_override_path in components/servo/lib

1 files changed, 1 insertions, 11 deletions

diff --git a/components/layout/webrender_helpers.rs b/components/layout/webrender_helpers.rs
index 0dec6409a49..75502f0815d 100644
--- a/components/layout/webrender_helpers.rs
+++ b/components/layout/webrender_helpers.rs
@@ -11,7 +11,7 @@ use app_units::Au;
 use euclid::{Matrix4D, Point2D, Rect, Size2D, TypedRect};
 use gfx::display_list::{BorderRadii, BoxShadowClipMode, ClippingRegion};
 use gfx::display_list::{DisplayItem, DisplayList, DisplayListTraversal, StackingContextType};
-use gfx_traits::{FragmentType, ScrollPolicy, StackingContextId, ScrollRootId};
+use gfx_traits::{FragmentType, ScrollPolicy, ScrollRootId};
 use style::computed_values::{image_rendering, mix_blend_mode};
 use style::computed_values::filter::{self, Filter};
 use style::values::computed::BorderStyle;
@@ -346,22 +346,14 @@ impl WebRenderDisplayItemConverter for DisplayItem {
                     ScrollPolicy::FixedPosition => webrender_traits::ScrollPolicy::Fixed,
                 };
 
-                let scroll_layer_id = if stacking_context.id == StackingContextId::root() {
-                    Some(frame_builder.next_scroll_layer_id(ScrollRootId::root()))
-                } else {
-                    None
-                };
-
                 let context =
                     webrender_traits::StackingContext::new(
-                        scroll_layer_id,
                         webrender_scroll_policy,
                         stacking_context.bounds.to_rectf(),
                         stacking_context.overflow.to_rectf(),
                         stacking_context.z_index,
                         &stacking_context.transform,
                         &stacking_context.perspective,
-                        stacking_context.establishes_3d_context,
                         stacking_context.blend_mode.to_blend_mode(),
                         stacking_context.filters.to_filter_ops(),
                         &mut frame_builder.auxiliary_lists_builder);
@@ -372,14 +364,12 @@ impl WebRenderDisplayItemConverter for DisplayItem {
             DisplayItem::PushScrollRoot(ref item) => {
                 let overflow = TypedRect::new(Point2D::zero(), item.scroll_root.size);
                 let context = webrender_traits::StackingContext::new(
-                        Some(frame_builder.next_scroll_layer_id(item.scroll_root.id)),
                         webrender_traits::ScrollPolicy::Scrollable,
                         item.scroll_root.clip.to_rectf(),
                         overflow.to_rectf(),
                         0,
                         &Matrix4D::identity(),
                         &Matrix4D::identity(),
-                        true,
                         mix_blend_mode::T::normal.to_blend_mode(),
                         filter::T::new(Vec::new()).to_filter_ops(),
                         &mut frame_builder.auxiliary_lists_builder);