Commit 8ad7a18d authored by Kartikaya Gupta's avatar Kartikaya Gupta
Browse files

Bug 1398241 - Update webrender to commit 7d9444a24fb98bcc41afdca2a5bf145d514500f1. r=jrmuizel 

MozReview-Commit-ID: 7faAn2asOOw

--HG--
extra : rebase_source : 9203005b5edf5a846aceb16f8f8d6f7c9082898d
parent 8e2f6113

gfx/doc/README.webrender

+1 −1
Original line number Diff line number Diff line
@@ -79,4 +79,4 @@ to make sure that mozjs_sys also has its Cargo.lock file updated if needed, henc 
the need to run the cargo update command in js/src as well. Hopefully this will

be resolved soon.



Latest Commit: 6cf9cd4075efdf7467bad71b372170f626a8fce4
 
Latest Commit: 7d9444a24fb98bcc41afdca2a5bf145d514500f1

gfx/webrender/Cargo.toml

+2 −2
Original line number Diff line number Diff line
@@ -13,11 +13,11 @@ profiler = ["thread_profiler/thread_profiler"] 
debugger = ["ws", "serde_json", "serde", "serde_derive"]



[dependencies]

app_units = "0.5"

app_units = "0.5.6"

bincode = "0.8"

bit-set = "0.4"

byteorder = "1.0"

euclid = "0.15.1"

euclid = "0.15.2"

fxhash = "0.2.1"

gleam = "0.4.8"

lazy_static = "0.2"

gfx/webrender/examples/animation.rs

+9 −3
Original line number Diff line number Diff line
@@ -31,8 +31,14 @@ impl Example for App { 
        // Note the magic "42" we use as the animation key. That is used to update

        // the transform in the keyboard event handler code.

        let bounds = (0,0).to(100, 100);

        builder.push_stacking_context(ScrollPolicy::Scrollable,

                                      bounds,

        let info = LayoutPrimitiveInfo {

            rect: bounds,

            local_clip: None,

            is_backface_visible: true,

        };



        builder.push_stacking_context(&info,

                                      ScrollPolicy::Scrollable,

                                      Some(PropertyBinding::Binding(PropertyBindingKey::new(42))),

                                      TransformStyle::Flat,

                                      None,
@@ -40,7 +46,7 @@ impl Example for App { 
                                      Vec::new());



        // Fill it with a white rect

        builder.push_rect(bounds, None, ColorF::new(1.0, 1.0, 1.0, 1.0));

        builder.push_rect(&info, ColorF::new(1.0, 1.0, 1.0, 1.0));



        builder.pop_stacking_context();

    }

gfx/webrender/examples/basic.rs

+37 −12
Original line number Diff line number Diff line
@@ -185,8 +185,13 @@ impl Example for App { 
              _pipeline_id: PipelineId,

              _document_id: DocumentId) {

        let bounds = LayoutRect::new(LayoutPoint::zero(), layout_size);

        builder.push_stacking_context(ScrollPolicy::Scrollable,

                                      bounds,

        let info = LayoutPrimitiveInfo {

            rect: bounds,

            local_clip: None,

            is_backface_visible: true,

        };

        builder.push_stacking_context(&info,

                                      ScrollPolicy::Scrollable,

                                      None,

                                      TransformStyle::Flat,

                                      None,
@@ -209,11 +214,19 @@ impl Example for App { 
        let id = builder.define_clip(None, bounds, vec![complex], Some(mask));

        builder.push_clip_id(id);



        let bounds = (100, 100).to(200, 200);

        builder.push_rect(bounds, None, ColorF::new(0.0, 1.0, 0.0, 1.0));

        let info = LayoutPrimitiveInfo {

            rect: (100, 100).to(200, 200),

            local_clip: None,

            is_backface_visible: true,

        };

        builder.push_rect(&info, ColorF::new(0.0, 1.0, 0.0, 1.0));



        let bounds = (250, 100).to(350, 200);

        builder.push_rect(bounds, None, ColorF::new(0.0, 1.0, 0.0, 1.0));

        let info = LayoutPrimitiveInfo {

            rect: (250, 100).to(350, 200),

            local_clip: None,

            is_backface_visible: true,

        };

        builder.push_rect(&info, ColorF::new(0.0, 1.0, 0.0, 1.0));

        let border_side = BorderSide {

            color: ColorF::new(0.0, 0.0, 1.0, 1.0),

            style: BorderStyle::Groove,
@@ -232,8 +245,12 @@ impl Example for App { 
            radius: BorderRadius::uniform(20.0),

        });



        let bounds = (100, 100).to(200, 200);

        builder.push_border(bounds, None, border_widths, border_details);

        let info = LayoutPrimitiveInfo {

            rect: (100, 100).to(200, 200),

            local_clip: None,

            is_backface_visible: true,

        };

        builder.push_border(&info, border_widths, border_details);





        if false { // draw text?
@@ -295,9 +312,13 @@ impl Example for App { 
                    point: LayoutPoint::new(650.0, 100.0),

                },

            ];

            let info = LayoutPrimitiveInfo {

                rect: text_bounds,

                local_clip: None,

                is_backface_visible: true,

            };



            builder.push_text(text_bounds,

                              None,

            builder.push_text(&info,

                              &glyphs,

                              font_instance_key,

                              ColorF::new(1.0, 1.0, 0.0, 1.0),
@@ -313,9 +334,13 @@ impl Example for App { 
            let spread_radius = 0.0;

            let simple_border_radius = 8.0;

            let box_shadow_type = BoxShadowClipMode::Inset;

            let info = LayoutPrimitiveInfo {

                rect: rect,

                local_clip: Some(LocalClip::from(bounds)),

                is_backface_visible: true,

            };



            builder.push_box_shadow(rect,

                                    Some(LocalClip::from(bounds)),

            builder.push_box_shadow(&info,

                                    simple_box_bounds,

                                    offset,

                                    color,

gfx/webrender/examples/blob.rs

+19 −6
Original line number Diff line number Diff line
@@ -240,26 +240,39 @@ impl Example for App { 
        );



        let bounds = api::LayoutRect::new(api::LayoutPoint::zero(), layout_size);

        builder.push_stacking_context(api::ScrollPolicy::Scrollable,

                                      bounds,

        let info = api::LayoutPrimitiveInfo {

            rect: bounds,

            local_clip: None,

            is_backface_visible: true,

        };

        builder.push_stacking_context(&info,

                                      api::ScrollPolicy::Scrollable,

                                      None,

                                      api::TransformStyle::Flat,

                                      None,

                                      api::MixBlendMode::Normal,

                                      Vec::new());



        let info = api::LayoutPrimitiveInfo {

            rect: (30, 30).by(500, 500),

            local_clip: Some(api::LocalClip::from(bounds)),

            is_backface_visible: true,

        };

        builder.push_image(

            (30, 30).by(500, 500),

            Some(api::LocalClip::from(bounds)),

            &info,

            api::LayoutSize::new(500.0, 500.0),

            api::LayoutSize::new(0.0, 0.0),

            api::ImageRendering::Auto,

            blob_img1,

        );



        let info = api::LayoutPrimitiveInfo {

            rect: (600, 600).by(200, 200),

            local_clip: Some(api::LocalClip::from(bounds)),

            is_backface_visible: true,

        };

        builder.push_image(

            (600, 600).by(200, 200),

            Some(api::LocalClip::from(bounds)),

            &info,

            api::LayoutSize::new(200.0, 200.0),

            api::LayoutSize::new(0.0, 0.0),

            api::ImageRendering::Auto,