Skip to content

/ webrender

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add some factories for PrimitiveInfo #1708

Merged
merged 1 commit into from Sep 18, 2017
+104 −261
Merged

Add some factories for PrimitiveInfo #1708

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

6 webrender/examples/animation.rs
View file
Open in desktop
@@ -33,11 +33,7 @@ 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);
let info = LayoutPrimitiveInfo {
rect: bounds,
local_clip: None,
is_backface_visible: true,
};
let info = LayoutPrimitiveInfo::new(bounds);

builder.push_stacking_context(
&info,
36 webrender/examples/basic.rs
View file
Open in desktop
@@ -195,11 +195,7 @@ impl Example for App {
_document_id: DocumentId,
) {
let bounds = LayoutRect::new(LayoutPoint::zero(), layout_size);
let info = LayoutPrimitiveInfo {
rect: bounds,
local_clip: None,
is_backface_visible: true,
};
let info = LayoutPrimitiveInfo::new(bounds);
builder.push_stacking_context(
&info,
ScrollPolicy::Scrollable,
@@ -226,18 +222,10 @@ impl Example for App {
let id = builder.define_clip(None, bounds, vec![complex], Some(mask));
builder.push_clip_id(id);

let info = LayoutPrimitiveInfo {
rect: (100, 100).to(200, 200),
local_clip: None,
is_backface_visible: true,
};
let info = LayoutPrimitiveInfo::new((100, 100).to(200, 200));
builder.push_rect(&info, 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,
};
let info = LayoutPrimitiveInfo::new((250, 100).to(350, 200));
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),
@@ -257,11 +245,7 @@ impl Example for App {
radius: BorderRadius::uniform(20.0),
});

let info = LayoutPrimitiveInfo {
rect: (100, 100).to(200, 200),
local_clip: None,
is_backface_visible: true,
};
let info = LayoutPrimitiveInfo::new((100, 100).to(200, 200));
builder.push_border(&info, border_widths, border_details);


@@ -325,12 +309,8 @@ impl Example for App {
point: LayoutPoint::new(650.0, 100.0),
},
];
let info = LayoutPrimitiveInfo {
rect: text_bounds,
local_clip: None,
is_backface_visible: true,
};

let info = LayoutPrimitiveInfo::new(text_bounds);
builder.push_text(
&info,
&glyphs,
@@ -350,11 +330,7 @@ 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,
};
let info = LayoutPrimitiveInfo::with_clip_rect(rect, bounds);

builder.push_box_shadow(
&info,
18 webrender/examples/blob.rs
View file
Open in desktop
@@ -248,11 +248,7 @@ impl Example for App {
);

let bounds = api::LayoutRect::new(api::LayoutPoint::zero(), layout_size);
let info = api::LayoutPrimitiveInfo {
rect: bounds,
local_clip: None,
is_backface_visible: true,
};
let info = api::LayoutPrimitiveInfo::new(bounds);
builder.push_stacking_context(
&info,
api::ScrollPolicy::Scrollable,
@@ -263,11 +259,7 @@ impl Example for App {
Vec::new(),
);

let info = api::LayoutPrimitiveInfo {
rect: (30, 30).by(500, 500),
local_clip: Some(api::LocalClip::from(bounds)),
is_backface_visible: true,
};
let info = api::LayoutPrimitiveInfo::new((30, 30).by(500, 500));

This comment has been minimized.

Sign in to view
@kvark

kvark Sep 15, 2017

Member

missing local clip?

This comment has been minimized.

Sign in to view
@mrobinson

mrobinson Sep 18, 2017

Author Member

I'll fix this.
builder.push_image(
&info,
api::LayoutSize::new(500.0, 500.0),
@@ -276,11 +268,7 @@ impl Example for App {
blob_img1,
);

let info = api::LayoutPrimitiveInfo {
rect: (600, 600).by(200, 200),
local_clip: Some(api::LocalClip::from(bounds)),
is_backface_visible: true,
};
let info = api::LayoutPrimitiveInfo::new((600, 600).by(200, 200));

This comment has been minimized.

Sign in to view
@kvark

kvark Sep 15, 2017

Member

missing local clip?

This comment has been minimized.

Sign in to view
@mrobinson

mrobinson Sep 18, 2017

Author Member

Ditto!
builder.push_image(
&info,
api::LayoutSize::new(200.0, 200.0),
12 webrender/examples/frame_output.rs
View file
Open in desktop
@@ -71,11 +71,7 @@ impl Example for App {
let resources = ResourceUpdates::new();

let bounds = (0, 0).to(50, 50);
let info = LayoutPrimitiveInfo {
rect: bounds,
local_clip: None,
is_backface_visible: true,
};
let info = LayoutPrimitiveInfo::new(bounds);
builder.push_stacking_context(
&info,
ScrollPolicy::Scrollable,
@@ -104,11 +100,7 @@ impl Example for App {
}

let bounds = (100, 100).to(200, 200);
let info = LayoutPrimitiveInfo {
rect: bounds,
local_clip: None,
is_backface_visible: true,
};
let info = LayoutPrimitiveInfo::new(bounds);
builder.push_stacking_context(
&info,
ScrollPolicy::Scrollable,
7 webrender/examples/iframe.rs
View file
Open in desktop
@@ -34,12 +34,8 @@ impl Example for App {

let sub_pipeline_id = PipelineId(pipeline_id.0, 42);
let mut sub_builder = DisplayListBuilder::new(sub_pipeline_id, sub_bounds.size);
let info = LayoutPrimitiveInfo {
rect: sub_bounds,
local_clip: None,
is_backface_visible: true,
};

let info = LayoutPrimitiveInfo::new(sub_bounds);
sub_builder.push_stacking_context(
&info,
ScrollPolicy::Scrollable,
@@ -49,6 +45,7 @@ impl Example for App {
MixBlendMode::Normal,
Vec::new(),
);

// green rect visible == success
sub_builder.push_rect(&info, ColorF::new(0.0, 1.0, 0.0, 1.0));
sub_builder.pop_stacking_context();
24 webrender/examples/image_resize.rs
View file
Open in desktop
@@ -42,11 +42,7 @@ impl Example for App {
);

let bounds = (0, 0).to(512, 512);
let info = LayoutPrimitiveInfo {
rect: bounds,
local_clip: None,
is_backface_visible: true,
};
let info = LayoutPrimitiveInfo::new(bounds);
builder.push_stacking_context(
&info,
ScrollPolicy::Scrollable,
@@ -59,11 +55,10 @@ impl Example for App {

let image_size = LayoutSize::new(100.0, 100.0);

let info = LayoutPrimitiveInfo {
rect: LayoutRect::new(LayoutPoint::new(100.0, 100.0), image_size),
local_clip: Some(LocalClip::from(bounds)),
is_backface_visible: true,
};
let info = LayoutPrimitiveInfo::with_clip_rect(
LayoutRect::new(LayoutPoint::new(100.0, 100.0), image_size),
bounds,
);
builder.push_image(
&info,
image_size,
@@ -72,11 +67,10 @@ impl Example for App {
self.image_key,
);

let info = LayoutPrimitiveInfo {
rect: LayoutRect::new(LayoutPoint::new(250.0, 100.0), image_size),
local_clip: Some(LocalClip::from(bounds)),
is_backface_visible: true,
};
let info = LayoutPrimitiveInfo::with_clip_rect(
LayoutRect::new(LayoutPoint::new(250.0, 100.0), image_size),
bounds,
);
builder.push_image(
&info,
image_size,
43 webrender/examples/nested_display_list.rs
View file
Open in desktop
@@ -27,11 +27,7 @@ impl Example for App {
_document_id: DocumentId,
) {
let bounds = LayoutRect::new(LayoutPoint::zero(), layout_size);
let info = LayoutPrimitiveInfo {
rect: bounds,
local_clip: None,
is_backface_visible: true,
};
let info = LayoutPrimitiveInfo::new(bounds);
builder.push_stacking_context(
&info,
ScrollPolicy::Scrollable,
@@ -43,11 +39,7 @@ impl Example for App {
);

let outer_scroll_frame_rect = (100, 100).to(600, 400);
let info = LayoutPrimitiveInfo {
rect: outer_scroll_frame_rect,
local_clip: None,
is_backface_visible: true,
};
let info = LayoutPrimitiveInfo::new(outer_scroll_frame_rect);
builder.push_rect(&info, ColorF::new(1.0, 1.0, 1.0, 1.0));

let nested_clip_id = builder.define_scroll_frame(
@@ -63,20 +55,12 @@ impl Example for App {
let mut builder2 = DisplayListBuilder::new(pipeline_id, layout_size);
let mut builder3 = DisplayListBuilder::new(pipeline_id, layout_size);

let info = LayoutPrimitiveInfo {
rect: (110, 110).to(210, 210),
local_clip: None,
is_backface_visible: true,
};
let info = LayoutPrimitiveInfo::new((110, 110).to(210, 210));
builder3.push_rect(&info, ColorF::new(0.0, 1.0, 0.0, 1.0));

// A fixed position rectangle should be fixed to the reference frame that starts
// in the outer display list.
let info = LayoutPrimitiveInfo {
rect: (220, 110).to(320, 210),
local_clip: None,
is_backface_visible: true,
};
let info = LayoutPrimitiveInfo::new((220, 110).to(320, 210));
builder3.push_stacking_context(
&info,
ScrollPolicy::Fixed,
@@ -86,23 +70,16 @@ impl Example for App {
MixBlendMode::Normal,
Vec::new(),
);
let info = LayoutPrimitiveInfo {
rect: (0, 0).to(100, 100),
local_clip: None,
is_backface_visible: true,
};

let info = LayoutPrimitiveInfo::new((0, 0).to(100, 100));
builder3.push_rect(&info, ColorF::new(0.0, 1.0, 0.0, 1.0));
builder3.pop_stacking_context();

// Now we push an inner scroll frame that should have the same id as the outer one,
// but the WebRender nested display list replacement code should convert it into
// a unique ClipId.
let inner_scroll_frame_rect = (330, 110).to(530, 360);
let info = LayoutPrimitiveInfo {
rect: inner_scroll_frame_rect,
local_clip: None,
is_backface_visible: true,
};
let info = LayoutPrimitiveInfo::new(inner_scroll_frame_rect);
builder3.push_rect(&info, ColorF::new(1.0, 0.0, 1.0, 0.5));
let inner_nested_clip_id = builder3.define_scroll_frame(
None,
@@ -113,11 +90,7 @@ impl Example for App {
ScrollSensitivity::ScriptAndInputEvents,
);
builder3.push_clip_id(inner_nested_clip_id);
let info = LayoutPrimitiveInfo {
rect: (340, 120).to(440, 220),
local_clip: None,
is_backface_visible: true,
};
let info = LayoutPrimitiveInfo::new((340, 120).to(440, 220));
builder3.push_rect(&info, ColorF::new(0.0, 1.0, 0.0, 1.0));
builder3.pop_clip_id();

ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.