--- a/gfx/doc/README.webrender
+++ b/gfx/doc/README.webrender
@@ -74,9 +74,9 @@ there is another crate in m-c called moz
the same folder to store its rust dependencies. If one of the libraries that is
required by both mozjs_sys and webrender is updated without updating the other
project's Cargo.lock file, that results in build bustage.
This means that any time you do this sort of manual update of packages, you need
to make sure that mozjs_sys also has its Cargo.lock file updated if needed, hence
the need to run the cargo update command in js/src as well. Hopefully this will
be resolved soon.
-Latest Commit: 76a3213080ca5c2e2a612c3023c50c81a111fd55
+Latest Commit: a54cc729259588dd1ff52c86d0c62cb2a1767137
--- a/gfx/webrender/Cargo.toml
+++ b/gfx/webrender/Cargo.toml
@@ -1,41 +1,41 @@
[package]
name = "webrender"
-version = "0.39.0"
+version = "0.40.0"
authors = ["Glenn Watson <gw@intuitionlibrary.com>"]
license = "MPL-2.0"
repository = "https://github.com/servo/webrender"
build = "build.rs"
[features]
default = ["freetype-lib", "webgl"]
freetype-lib = ["freetype/servo-freetype-sys"]
profiler = ["thread_profiler/thread_profiler"]
webgl = ["offscreen_gl_context", "webrender_traits/webgl"]
[dependencies]
app_units = "0.4"
bincode = "1.0.0-alpha6"
bit-set = "0.4"
byteorder = "1.0"
-euclid = "0.11.2"
+euclid = "0.13"
fnv = "1.0"
gleam = "0.4.3"
lazy_static = "0.2"
log = "0.3"
num-traits = "0.1.32"
offscreen_gl_context = {version = "0.8.0", features = ["serde", "osmesa"], optional = true}
time = "0.1"
rayon = {version = "0.7", features = ["unstable"]}
webrender_traits = {path = "../webrender_traits"}
bitflags = "0.7"
gamma-lut = "0.2"
thread_profiler = "0.1.1"
-plane-split = "0.3"
+plane-split = "0.4"
[dev-dependencies]
angle = {git = "https://github.com/servo/angle", branch = "servo"}
rand = "0.3" # for the benchmarks
servo-glutin = "0.10.1" # for the example apps
[target.'cfg(any(target_os = "android", all(unix, not(target_os = "macos"))))'.dependencies]
freetype = { version = "0.2", default-features = false }
--- a/gfx/webrender/examples/yuv.rs
+++ b/gfx/webrender/examples/yuv.rs
@@ -11,17 +11,17 @@ extern crate webrender_traits;
use gleam::gl;
use glutin::TouchPhase;
use std::collections::HashMap;
use std::env;
use std::path::PathBuf;
use webrender_traits::{ColorF, Epoch};
use webrender_traits::{DeviceIntPoint, DeviceUintSize, LayoutPoint, LayoutRect, LayoutSize};
-use webrender_traits::{ImageData, ImageDescriptor, ImageFormat};
+use webrender_traits::{ImageData, ImageDescriptor, ImageFormat, ImageRendering};
use webrender_traits::{PipelineId, TransformStyle};
use webrender_traits::{YuvColorSpace, YuvData};
#[derive(Debug)]
enum Gesture {
None,
Pan,
Zoom,
@@ -277,24 +277,26 @@ fn main() {
);
let clip = builder.push_clip_region(&bounds, vec![], None);
builder.push_yuv_image(
LayoutRect::new(LayoutPoint::new(100.0, 0.0), LayoutSize::new(100.0, 100.0)),
clip,
YuvData::NV12(yuv_chanel1, yuv_chanel2),
YuvColorSpace::Rec601,
+ ImageRendering::Auto,
);
let clip = builder.push_clip_region(&bounds, vec![], None);
builder.push_yuv_image(
LayoutRect::new(LayoutPoint::new(300.0, 0.0), LayoutSize::new(100.0, 100.0)),
clip,
YuvData::PlanarYCbCr(yuv_chanel1, yuv_chanel2_1, yuv_chanel3),
YuvColorSpace::Rec601,
+ ImageRendering::Auto,
);
builder.pop_stacking_context();
api.set_display_list(
Some(root_background_color),
epoch,
LayoutSize::new(width as f32, height as f32),
--- a/gfx/webrender/res/prim_shared.glsl
+++ b/gfx/webrender/res/prim_shared.glsl
@@ -79,33 +79,26 @@ RectWithSize to_rect_with_size(RectWithE
vec2 clamp_rect(vec2 point, RectWithSize rect) {
return clamp(point, rect.p0, rect.p0 + rect.size);
}
vec2 clamp_rect(vec2 point, RectWithEndpoint rect) {
return clamp(point, rect.p0, rect.p1);
}
-// Clamp 2 points at once.
-vec4 clamp_rect(vec4 points, RectWithSize rect) {
- return clamp(points, rect.p0.xyxy, rect.p0.xyxy + rect.size.xyxy);
-}
-
-vec4 clamp_rect(vec4 points, RectWithEndpoint rect) {
- return clamp(points, rect.p0.xyxy, rect.p1.xyxy);
+RectWithEndpoint intersect_rect(RectWithEndpoint a, RectWithEndpoint b) {
+ vec2 p0 = clamp_rect(a.p0, b);
+ vec2 p1 = clamp_rect(a.p1, b);
+ return RectWithEndpoint(p0, max(p0, p1));
}
RectWithSize intersect_rect(RectWithSize a, RectWithSize b) {
- vec4 p = clamp_rect(vec4(a.p0, a.p0 + a.size), b);
- return RectWithSize(p.xy, max(vec2(0.0), p.zw - p.xy));
-}
-
-RectWithEndpoint intersect_rect(RectWithEndpoint a, RectWithEndpoint b) {
- vec4 p = clamp_rect(vec4(a.p0, a.p1), b);
- return RectWithEndpoint(p.xy, max(p.xy, p.zw));
+ RectWithEndpoint r = intersect_rect(to_rect_with_endpoint(a),
+ to_rect_with_endpoint(b));
+ return to_rect_with_size(r);
}
float distance_to_line(vec2 p0, vec2 perp_dir, vec2 p) {
vec2 dir_to_p0 = p0 - p;
return dot(normalize(perp_dir), dir_to_p0);
}
// TODO: convert back to RectWithEndPoint if driver issues are resolved, if ever.
@@ -558,58 +551,76 @@ vec4 get_layer_pos(vec2 pos, Layer layer
// get a point on the layer plane
vec4 ah = layer.transform * vec4(0.0, 0.0, 0.0, 1.0);
vec3 a = ah.xyz / ah.w;
// get the normal to the layer plane
vec3 n = transpose(mat3(layer.inv_transform)) * vec3(0.0, 0.0, 1.0);
return untransform(pos, n, a, layer.inv_transform);
}
+// Compute a snapping offset in world space (adjusted to pixel ratio),
+// given local position on the layer and a snap rectangle.
+vec2 compute_snap_offset(vec2 local_pos,
+ RectWithSize local_clip_rect,
+ Layer layer,
+ RectWithSize raw_snap_rect) {
+ // Clamp the snap rectangle.
+ RectWithSize snap_rect = intersect_rect(intersect_rect(raw_snap_rect, local_clip_rect),
+ layer.local_clip_rect);
+ // Transform the snap corners to the world space.
+ vec4 world_snap_p0 = layer.transform * vec4(snap_rect.p0, 0.0, 1.0);
+ vec4 world_snap_p1 = layer.transform * vec4(snap_rect.p0 + snap_rect.size, 0.0, 1.0);
+ // Snap bounds in world coordinates, adjusted for pixel ratio. XY = top left, ZW = bottom right
+ vec4 world_snap = uDevicePixelRatio * vec4(world_snap_p0.xy, world_snap_p1.xy) /
+ vec4(world_snap_p0.ww, world_snap_p1.ww);
+ /// World offsets applied to the corners of the snap rectangle.
+ vec4 snap_offsets = floor(world_snap + 0.5) - world_snap;
+
+ /// Compute the position of this vertex inside the snap rectangle.
+ vec2 normalized_snap_pos = (local_pos - snap_rect.p0) / snap_rect.size;
+ /// Compute the actual world offset for this vertex needed to make it snap.
+ return mix(snap_offsets.xy, snap_offsets.zw, normalized_snap_pos);
+}
+
struct VertexInfo {
vec2 local_pos;
vec2 screen_pos;
};
VertexInfo write_vertex(RectWithSize instance_rect,
RectWithSize local_clip_rect,
float z,
Layer layer,
AlphaBatchTask task,
- vec2 snap_ref) {
+ RectWithSize snap_rect) {
+
// Select the corner of the local rect that we are processing.
vec2 local_pos = instance_rect.p0 + instance_rect.size * aPosition.xy;
- // xy = top left corner of the local rect, zw = position of current vertex.
- vec4 local_p0_pos = vec4(snap_ref, local_pos);
-
// Clamp to the two local clip rects.
- local_p0_pos = clamp_rect(local_p0_pos, local_clip_rect);
- local_p0_pos = clamp_rect(local_p0_pos, layer.local_clip_rect);
+ vec2 clamped_local_pos = clamp_rect(clamp_rect(local_pos, local_clip_rect),
+ layer.local_clip_rect);
- // Transform the top corner and current vertex to world space.
- vec4 world_p0 = layer.transform * vec4(local_p0_pos.xy, 0.0, 1.0);
- world_p0.xyz /= world_p0.w;
- vec4 world_pos = layer.transform * vec4(local_p0_pos.zw, 0.0, 1.0);
- world_pos.xyz /= world_pos.w;
+ /// Compute the snapping offset.
+ vec2 snap_offset = compute_snap_offset(clamped_local_pos, local_clip_rect, layer, snap_rect);
- // Convert the world positions to device pixel space. xy=top left corner. zw=current vertex.
- vec4 device_p0_pos = vec4(world_p0.xy, world_pos.xy) * uDevicePixelRatio;
+ // Transform the current vertex to the world cpace.
+ vec4 world_pos = layer.transform * vec4(clamped_local_pos, 0.0, 1.0);
- // Calculate the distance to snap the vertex by (snap top left corner).
- vec2 snap_delta = device_p0_pos.xy - floor(device_p0_pos.xy + 0.5);
+ // Convert the world positions to device pixel space.
+ vec2 device_pos = world_pos.xy / world_pos.w * uDevicePixelRatio;
// Apply offsets for the render task to get correct screen location.
- vec2 final_pos = device_p0_pos.zw -
- snap_delta -
+ vec2 final_pos = device_pos + snap_offset -
task.screen_space_origin +
task.render_target_origin;
gl_Position = uTransform * vec4(final_pos, z, 1.0);
- VertexInfo vi = VertexInfo(local_p0_pos.zw, device_p0_pos.zw);
+ VertexInfo vi = VertexInfo(clamped_local_pos, device_pos);
return vi;
}
#ifdef WR_FEATURE_TRANSFORM
struct TransformVertexInfo {
vec3 local_pos;
vec2 screen_pos;
@@ -634,17 +645,17 @@ vec2 intersect_lines(vec2 p0, vec2 p1, v
return vec2(nx / d, ny / d);
}
TransformVertexInfo write_transform_vertex(RectWithSize instance_rect,
RectWithSize local_clip_rect,
float z,
Layer layer,
AlphaBatchTask task,
- vec2 snap_ref) {
+ RectWithSize snap_rect) {
RectWithEndpoint local_rect = to_rect_with_endpoint(instance_rect);
vec2 current_local_pos, prev_local_pos, next_local_pos;
// Select the current vertex and the previous/next vertices,
// based on the vertex ID that is known based on the instance rect.
switch (gl_VertexID) {
case 0:
@@ -693,33 +704,31 @@ TransformVertexInfo write_transform_vert
vec2 adjusted_next_p1 = next_device_pos + norm_next * amount;
// Intersect those adjusted lines to find the actual vertex position.
vec2 device_pos = intersect_lines(adjusted_prev_p0,
adjusted_prev_p1,
adjusted_next_p0,
adjusted_next_p1);
- // Calculate the snap amount based on the first vertex as a reference point.
- vec4 world_p0 = layer.transform * vec4(snap_ref, 0.0, 1.0);
- vec2 device_p0 = uDevicePixelRatio * world_p0.xy / world_p0.w;
- vec2 snap_delta = device_p0 - floor(device_p0 + 0.5);
+ vec4 layer_pos = get_layer_pos(device_pos / uDevicePixelRatio, layer);
+
+ /// Compute the snapping offset.
+ vec2 snap_offset = compute_snap_offset(layer_pos.xy / layer_pos.w,
+ local_clip_rect, layer, snap_rect);
// Apply offsets for the render task to get correct screen location.
- vec2 final_pos = device_pos -
- snap_delta -
+ vec2 final_pos = device_pos + snap_offset -
task.screen_space_origin +
task.render_target_origin;
gl_Position = uTransform * vec4(final_pos, z, 1.0);
vLocalBounds = vec4(local_rect.p0, local_rect.p1);
- vec4 layer_pos = get_layer_pos(device_pos / uDevicePixelRatio, layer);
-
return TransformVertexInfo(layer_pos.xyw, device_pos);
}
#endif //WR_FEATURE_TRANSFORM
struct ResourceRect {
vec4 uv_rect;
};
--- a/gfx/webrender/res/ps_angle_gradient.vs.glsl
+++ b/gfx/webrender/res/ps_angle_gradient.vs.glsl
@@ -7,17 +7,17 @@ void main(void) {
Primitive prim = load_primitive();
Gradient gradient = fetch_gradient(prim.prim_index);
VertexInfo vi = write_vertex(prim.local_rect,
prim.local_clip_rect,
prim.z,
prim.layer,
prim.task,
- prim.local_rect.p0);
+ prim.local_rect);
vPos = vi.local_pos - prim.local_rect.p0;
vec2 start_point = gradient.start_end_point.xy;
vec2 end_point = gradient.start_end_point.zw;
vec2 dir = end_point - start_point;
vStartPoint = start_point;
--- a/gfx/webrender/res/ps_border_corner.vs.glsl
+++ b/gfx/webrender/res/ps_border_corner.vs.glsl
@@ -22,25 +22,29 @@ void set_radii(int style,
vec2 adjusted_widths) {
vRadii0.xy = get_radii(radii, 2.0 * widths);
vRadii0.zw = get_radii(radii - widths, -widths);
switch (style) {
case BORDER_STYLE_RIDGE:
case BORDER_STYLE_GROOVE:
vRadii1.xy = radii - adjusted_widths;
- vRadii1.zw = -widths;
+ // See comment in default branch
+ vRadii1.zw = vec2(-100.0);
break;
case BORDER_STYLE_DOUBLE:
vRadii1.xy = get_radii(radii - adjusted_widths, -widths);
vRadii1.zw = get_radii(radii - widths + adjusted_widths, -widths);
break;
default:
- vRadii1.xy = -widths;
- vRadii1.zw = -widths;
+ // These aren't needed, so we set them to some reasonably large
+ // negative value so later computations will discard them. This
+ // avoids branches and numerical issues in the fragment shader.
+ vRadii1.xy = vec2(-100.0);
+ vRadii1.zw = vec2(-100.0);
break;
}
}
void set_edge_line(vec2 border_width,
vec2 outer_corner,
vec2 gradient_sign) {
vec2 gradient = border_width * gradient_sign;
@@ -262,21 +266,21 @@ void main(void) {
segment_rect.size = p1 - p0;
#ifdef WR_FEATURE_TRANSFORM
TransformVertexInfo vi = write_transform_vertex(segment_rect,
prim.local_clip_rect,
prim.z,
prim.layer,
prim.task,
- prim.local_rect.p0);
+ prim.local_rect);
#else
VertexInfo vi = write_vertex(segment_rect,
prim.local_clip_rect,
prim.z,
prim.layer,
prim.task,
- prim.local_rect.p0);
+ prim.local_rect);
#endif
vLocalPos = vi.local_pos;
write_clip(vi.screen_pos, prim.clip_area);
}
--- a/gfx/webrender/res/ps_border_edge.vs.glsl
+++ b/gfx/webrender/res/ps_border_edge.vs.glsl
@@ -179,21 +179,21 @@ void main(void) {
write_color(color, style, color_flip);
#ifdef WR_FEATURE_TRANSFORM
TransformVertexInfo vi = write_transform_vertex(segment_rect,
prim.local_clip_rect,
prim.z,
prim.layer,
prim.task,
- prim.local_rect.p0);
+ prim.local_rect);
#else
VertexInfo vi = write_vertex(segment_rect,
prim.local_clip_rect,
prim.z,
prim.layer,
prim.task,
- prim.local_rect.p0);
+ prim.local_rect);
#endif
vLocalPos = vi.local_pos;
write_clip(vi.screen_pos, prim.clip_area);
}
--- a/gfx/webrender/res/ps_box_shadow.vs.glsl
+++ b/gfx/webrender/res/ps_box_shadow.vs.glsl
@@ -8,17 +8,17 @@ void main(void) {
BoxShadow bs = fetch_boxshadow(prim.prim_index);
RectWithSize segment_rect = fetch_instance_geometry(prim.user_data0);
VertexInfo vi = write_vertex(segment_rect,
prim.local_clip_rect,
prim.z,
prim.layer,
prim.task,
- prim.local_rect.p0);
+ prim.local_rect);
RenderTaskData child_task = fetch_render_task(prim.user_data1);
vUv.z = child_task.data1.x;
// Constant offsets to inset from bilinear filtering border.
vec2 patch_origin = child_task.data0.xy + vec2(1.0);
vec2 patch_size_device_pixels = child_task.data0.zw - vec2(2.0);
vec2 patch_size = patch_size_device_pixels / uDevicePixelRatio;
--- a/gfx/webrender/res/ps_cache_image.vs.glsl
+++ b/gfx/webrender/res/ps_cache_image.vs.glsl
@@ -9,17 +9,17 @@
void main(void) {
Primitive prim = load_primitive();
VertexInfo vi = write_vertex(prim.local_rect,
prim.local_clip_rect,
prim.z,
prim.layer,
prim.task,
- prim.local_rect.p0);
+ prim.local_rect);
RenderTaskData child_task = fetch_render_task(prim.user_data1);
vUv.z = child_task.data1.x;
vec2 texture_size = vec2(textureSize(sCacheRGBA8, 0));
vec2 uv0 = child_task.data0.xy / texture_size;
vec2 uv1 = (child_task.data0.xy + child_task.data0.zw) / texture_size;
--- a/gfx/webrender/res/ps_gradient.vs.glsl
+++ b/gfx/webrender/res/ps_gradient.vs.glsl
@@ -57,26 +57,26 @@ void main(void) {
}
#ifdef WR_FEATURE_TRANSFORM
TransformVertexInfo vi = write_transform_vertex(segment_rect,
prim.local_clip_rect,
prim.z,
prim.layer,
prim.task,
- prim.local_rect.p0);
+ prim.local_rect);
vLocalPos = vi.local_pos;
vec2 f = (vi.local_pos.xy - prim.local_rect.p0) / prim.local_rect.size;
#else
VertexInfo vi = write_vertex(segment_rect,
prim.local_clip_rect,
prim.z,
prim.layer,
prim.task,
- prim.local_rect.p0);
+ prim.local_rect);
vec2 f = (vi.local_pos - segment_rect.p0) / segment_rect.size;
vPos = vi.local_pos;
#endif
write_clip(vi.screen_pos, prim.clip_area);
vColor = mix(adjusted_color_g0, adjusted_color_g1, dot(f, axis));
--- a/gfx/webrender/res/ps_image.vs.glsl
+++ b/gfx/webrender/res/ps_image.vs.glsl
@@ -9,25 +9,25 @@ void main(void) {
ResourceRect res = fetch_resource_rect(prim.user_data0);
#ifdef WR_FEATURE_TRANSFORM
TransformVertexInfo vi = write_transform_vertex(prim.local_rect,
prim.local_clip_rect,
prim.z,
prim.layer,
prim.task,
- prim.local_rect.p0);
+ prim.local_rect);
vLocalPos = vi.local_pos;
#else
VertexInfo vi = write_vertex(prim.local_rect,
prim.local_clip_rect,
prim.z,
prim.layer,
prim.task,
- prim.local_rect.p0);
+ prim.local_rect);
vLocalPos = vi.local_pos - prim.local_rect.p0;
#endif
write_clip(vi.screen_pos, prim.clip_area);
// If this is in WR_FEATURE_TEXTURE_RECT mode, the rect and size use
// non-normalized texture coordinates.
#ifdef WR_FEATURE_TEXTURE_RECT
--- a/gfx/webrender/res/ps_radial_gradient.vs.glsl
+++ b/gfx/webrender/res/ps_radial_gradient.vs.glsl
@@ -7,17 +7,17 @@ void main(void) {
Primitive prim = load_primitive();
RadialGradient gradient = fetch_radial_gradient(prim.prim_index);
VertexInfo vi = write_vertex(prim.local_rect,
prim.local_clip_rect,
prim.z,
prim.layer,
prim.task,
- prim.local_rect.p0);
+ prim.local_rect);
vPos = vi.local_pos - prim.local_rect.p0;
vStartCenter = gradient.start_end_center.xy;
vEndCenter = gradient.start_end_center.zw;
vStartRadius = gradient.start_end_radius_ratio_xy_extend_mode.x;
vEndRadius = gradient.start_end_radius_ratio_xy_extend_mode.y;
--- a/gfx/webrender/res/ps_rectangle.vs.glsl
+++ b/gfx/webrender/res/ps_rectangle.vs.glsl
@@ -8,23 +8,23 @@ void main(void) {
Rectangle rect = fetch_rectangle(prim.prim_index);
vColor = rect.color;
#ifdef WR_FEATURE_TRANSFORM
TransformVertexInfo vi = write_transform_vertex(prim.local_rect,
prim.local_clip_rect,
prim.z,
prim.layer,
prim.task,
- prim.local_rect.p0);
+ prim.local_rect);
vLocalPos = vi.local_pos;
#else
VertexInfo vi = write_vertex(prim.local_rect,
prim.local_clip_rect,
prim.z,
prim.layer,
prim.task,
- prim.local_rect.p0);
+ prim.local_rect);
#endif
#ifdef WR_FEATURE_CLIP
write_clip(vi.screen_pos, prim.clip_area);
#endif
}
--- a/gfx/webrender/res/ps_text_run.vs.glsl
+++ b/gfx/webrender/res/ps_text_run.vs.glsl
@@ -13,26 +13,26 @@ void main(void) {
(res.uv_rect.zw - res.uv_rect.xy) / uDevicePixelRatio);
#ifdef WR_FEATURE_TRANSFORM
TransformVertexInfo vi = write_transform_vertex(local_rect,
prim.local_clip_rect,
prim.z,
prim.layer,
prim.task,
- local_rect.p0);
+ local_rect);
vLocalPos = vi.local_pos;
vec2 f = (vi.local_pos.xy / vi.local_pos.z - local_rect.p0) / local_rect.size;
#else
VertexInfo vi = write_vertex(local_rect,
prim.local_clip_rect,
prim.z,
prim.layer,
prim.task,
- local_rect.p0);
+ local_rect);
vec2 f = (vi.local_pos - local_rect.p0) / local_rect.size;
#endif
write_clip(vi.screen_pos, prim.clip_area);
vec2 texture_size = vec2(textureSize(sColor0, 0));
vec2 st0 = res.uv_rect.xy / texture_size;
vec2 st1 = res.uv_rect.zw / texture_size;
--- a/gfx/webrender/res/ps_yuv_image.vs.glsl
+++ b/gfx/webrender/res/ps_yuv_image.vs.glsl
@@ -6,25 +6,25 @@
void main(void) {
Primitive prim = load_primitive();
#ifdef WR_FEATURE_TRANSFORM
TransformVertexInfo vi = write_transform_vertex(prim.local_rect,
prim.local_clip_rect,
prim.z,
prim.layer,
prim.task,
- prim.local_rect.p0);
+ prim.local_rect);
vLocalPos = vi.local_pos;
#else
VertexInfo vi = write_vertex(prim.local_rect,
prim.local_clip_rect,
prim.z,
prim.layer,
prim.task,
- prim.local_rect.p0);
+ prim.local_rect);
vLocalPos = vi.local_pos - prim.local_rect.p0;
#endif
write_clip(vi.screen_pos, prim.clip_area);
ResourceRect y_rect = fetch_resource_rect(prim.user_data0);
#ifndef WR_FEATURE_INTERLEAVED_Y_CB_CR // only 1 channel
ResourceRect u_rect = fetch_resource_rect(prim.user_data0 + 1);
--- a/gfx/webrender/src/border.rs
+++ b/gfx/webrender/src/border.rs
@@ -343,17 +343,19 @@ impl FrameBuilder {
// solid or none.
let all_corners_simple = corners.iter().all(|c| {
*c == BorderCornerKind::Solid || *c == BorderCornerKind::None
});
let all_edges_simple = edges.iter().all(|e| {
*e == BorderEdgeKind::Solid || *e == BorderEdgeKind::None
});
- if all_corners_simple && all_edges_simple {
+ let has_no_curve = radius.is_zero();
+
+ if has_no_curve && all_corners_simple && all_edges_simple {
let p0 = rect.origin;
let p1 = rect.bottom_right();
let rect_width = rect.size.width;
let rect_height = rect.size.height;
// Add a solid rectangle for each visible edge/corner combination.
if top_edge == BorderEdgeKind::Solid {
self.add_solid_rectangle(clip_and_scroll,
--- a/gfx/webrender/src/frame.rs
+++ b/gfx/webrender/src/frame.rs
@@ -8,16 +8,17 @@ use fnv::FnvHasher;
use internal_types::{ANGLE_FLOAT_TO_FIXED, AxisDirection};
use internal_types::{LowLevelFilterOp};
use internal_types::{RendererFrame};
use frame_builder::{FrameBuilder, FrameBuilderConfig};
use clip_scroll_tree::{ClipScrollTree, ScrollStates};
use profiler::TextureCacheProfileCounters;
use resource_cache::ResourceCache;
use scene::{Scene, SceneProperties};
+use std::cmp;
use std::collections::HashMap;
use std::hash::BuildHasherDefault;
use tiling::{CompositeOps, DisplayListMap, PrimitiveFlags};
use util::{ComplexClipRegionHelpers, subtract_rect};
use webrender_traits::{BuiltDisplayList, BuiltDisplayListIter, ClipAndScrollInfo, ClipDisplayItem};
use webrender_traits::{ClipId, ClipRegion, ColorF, DeviceUintRect, DeviceUintSize, DisplayItemRef};
use webrender_traits::{Epoch, FilterOp, ImageDisplayItem, ItemRange, LayerPoint, LayerRect};
use webrender_traits::{LayerSize, LayerToScrollTransform, LayoutSize, LayoutTransform};
@@ -461,17 +462,18 @@ impl Frame {
None);
}
}
SpecificDisplayItem::YuvImage(ref info) => {
context.builder.add_yuv_image(clip_and_scroll,
item.rect(),
item.clip_region(),
info.yuv_data,
- info.color_space);
+ info.color_space,
+ info.image_rendering);
}
SpecificDisplayItem::Text(ref text_info) => {
context.builder.add_text(clip_and_scroll,
item.rect(),
item.clip_region(),
text_info.font_key,
text_info.size,
text_info.blur_radius,
@@ -971,17 +973,20 @@ impl Frame {
pan: LayerPoint,
texture_cache_profile: &mut TextureCacheProfileCounters)
-> RendererFrame {
self.clip_scroll_tree.update_all_node_transforms(pan);
let frame = self.build_frame(resource_cache,
display_lists,
device_pixel_ratio,
texture_cache_profile);
- resource_cache.expire_old_resources(self.id);
+ // Expire any resources that haven't been used for `cache_expiry_frames`.
+ let num_frames_back = self.frame_builder_config.cache_expiry_frames;
+ let expiry_frame = FrameId(cmp::max(num_frames_back, self.id.0) - num_frames_back);
+ resource_cache.expire_old_resources(expiry_frame);
frame
}
fn build_frame(&mut self,
resource_cache: &mut ResourceCache,
display_lists: &DisplayListMap,
device_pixel_ratio: f32,
texture_cache_profile: &mut TextureCacheProfileCounters)
--- a/gfx/webrender/src/frame_builder.rs
+++ b/gfx/webrender/src/frame_builder.rs
@@ -99,29 +99,17 @@ fn make_polygon(sc: &StackingContext, no
Polygon::from_transformed_rect(bounds, node.world_content_transform, anchor)
}
#[derive(Clone, Copy)]
pub struct FrameBuilderConfig {
pub enable_scrollbars: bool,
pub default_font_render_mode: FontRenderMode,
pub debug: bool,
-}
-
-impl FrameBuilderConfig {
- pub fn new(enable_scrollbars: bool,
- default_font_render_mode: FontRenderMode,
- debug: bool)
- -> FrameBuilderConfig {
- FrameBuilderConfig {
- enable_scrollbars: enable_scrollbars,
- default_font_render_mode: default_font_render_mode,
- debug: debug,
- }
- }
+ pub cache_expiry_frames: u32,
}
pub struct FrameBuilder {
screen_size: DeviceUintSize,
background_color: Option<ColorF>,
prim_store: PrimitiveStore,
cmds: Vec<PrimitiveRunCmd>,
config: FrameBuilderConfig,
@@ -1070,32 +1058,34 @@ impl FrameBuilder {
PrimitiveContainer::Image(prim_cpu, prim_gpu));
}
pub fn add_yuv_image(&mut self,
clip_and_scroll: ClipAndScrollInfo,
rect: LayerRect,
clip_region: &ClipRegion,
yuv_data: YuvData,
- color_space: YuvColorSpace) {
+ color_space: YuvColorSpace,
+ image_rendering: ImageRendering) {
let format = yuv_data.get_format();
let yuv_key = match yuv_data {
YuvData::NV12(plane_0, plane_1) => [plane_0, plane_1, ImageKey::new(0, 0)],
YuvData::PlanarYCbCr(plane_0, plane_1, plane_2) =>
[plane_0, plane_1, plane_2],
YuvData::InterleavedYCbCr(plane_0) =>
[plane_0, ImageKey::new(0, 0), ImageKey::new(0, 0)],
};
let prim_cpu = YuvImagePrimitiveCpu {
yuv_key: yuv_key,
yuv_texture_id: [SourceTexture::Invalid, SourceTexture::Invalid, SourceTexture::Invalid],
yuv_resource_address: GpuStoreAddress(0),
format: format,
color_space: color_space,
+ image_rendering: image_rendering,
};
let prim_gpu = YuvImagePrimitiveGpu::new(rect.size);
self.add_primitive(clip_and_scroll,
&rect,
clip_region,
&[],
new file mode 100644
--- /dev/null
+++ b/gfx/webrender/src/glyph_rasterizer.rs
@@ -0,0 +1,395 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+use app_units::Au;
+use device::TextureFilter;
+use frame::FrameId;
+use platform::font::{FontContext, RasterizedGlyph};
+use profiler::TextureCacheProfileCounters;
+use rayon::ThreadPool;
+use rayon::prelude::*;
+use resource_cache::ResourceClassCache;
+use std::sync::{Arc, Mutex, MutexGuard};
+use std::sync::mpsc::{channel, Receiver, Sender};
+use std::collections::HashSet;
+use std::mem;
+use texture_cache::{TextureCacheItemId, TextureCache};
+use internal_types::FontTemplate;
+use webrender_traits::{FontKey, FontRenderMode, ImageData, ImageFormat};
+use webrender_traits::{ImageDescriptor, ColorF, LayoutPoint};
+use webrender_traits::{GlyphKey, GlyphOptions, GlyphInstance, GlyphDimensions};
+
+pub type GlyphCache = ResourceClassCache<GlyphRequest, Option<TextureCacheItemId>>;
+
+pub struct FontContexts {
+ // These worker are mostly accessed from their corresponding worker threads.
+ // The goal is that there should be no noticeable contention on the muteces.
+ worker_contexts: Vec<Mutex<FontContext>>,
+
+ // This worker should be accessed by threads that don't belong to thre thread pool
+ // (in theory that's only the render backend thread so no contention expected either).
+ shared_context: Mutex<FontContext>,
+
+ // Stored here as a convenience to get the current thread index.
+ workers: Arc<ThreadPool>,
+}
+
+impl FontContexts {
+ /// Get access to the font context associated to the current thread.
+ pub fn lock_current_context(&self) -> MutexGuard<FontContext> {
+ let id = self.current_worker_id();
+ self.lock_context(id)
+ }
+
+ /// Get access to any particular font context.
+ ///
+ /// The id is ```Some(i)``` where i is an index between 0 and num_worker_contexts
+ /// for font contexts associated to the thread pool, and None for the shared
+ /// global font context for use outside of the thread pool.
+ pub fn lock_context(&self, id: Option<usize>) -> MutexGuard<FontContext> {
+ match id {
+ Some(index) => self.worker_contexts[index].lock().unwrap(),
+ None => self.shared_context.lock().unwrap(),
+ }
+ }
+
+ /// Get access to the font context usable outside of the thread pool.
+ pub fn lock_shared_context(&self) -> MutexGuard<FontContext> {
+ self.shared_context.lock().unwrap()
+ }
+
+ // number of contexts associated to workers
+ pub fn num_worker_contexts(&self) -> usize {
+ self.worker_contexts.len()
+ }
+
+ fn current_worker_id(&self) -> Option<usize> {
+ self.workers.current_thread_index()
+ }
+}
+
+pub struct GlyphRasterizer {
+ workers: Arc<ThreadPool>,
+ font_contexts: Arc<FontContexts>,
+
+ // Receives the rendered glyphs.
+ glyph_rx: Receiver<Vec<GlyphRasterJob>>,
+ glyph_tx: Sender<Vec<GlyphRasterJob>>,
+
+ // Maintain a set of glyphs that have been requested this
+ // frame. This ensures the glyph thread won't rasterize
+ // the same glyph more than once in a frame. This is required
+ // because the glyph cache hash table is not updated
+ // until the end of the frame when we wait for glyph requests
+ // to be resolved.
+ pending_glyphs: HashSet<GlyphRequest>,
+
+ // We defer removing fonts to the end of the frame so that:
+ // - this work is done outside of the critical path,
+ // - we don't have to worry about the ordering of events if a font is used on
+ // a frame where it is used (although it seems unlikely).
+ fonts_to_remove: Vec<FontKey>,
+}
+
+impl GlyphRasterizer {
+ pub fn new(workers: Arc<ThreadPool>) -> Self {
+ let (glyph_tx, glyph_rx) = channel();
+
+ let num_workers = workers.current_num_threads();
+ let mut contexts = Vec::with_capacity(num_workers);
+
+ for _ in 0..num_workers {
+ contexts.push(Mutex::new(FontContext::new()));
+ }
+
+ GlyphRasterizer {
+ font_contexts: Arc::new(
+ FontContexts {
+ worker_contexts: contexts,
+ shared_context: Mutex::new(FontContext::new()),
+ workers: Arc::clone(&workers),
+ }
+ ),
+ glyph_rx: glyph_rx,
+ glyph_tx: glyph_tx,
+ pending_glyphs: HashSet::new(),
+ workers: workers,
+ fonts_to_remove: Vec::new(),
+ }
+ }
+
+ pub fn add_font(&mut self, font_key: FontKey, template: FontTemplate) {
+ let font_contexts = Arc::clone(&self.font_contexts);
+ // It's important to synchronously add the font for the shared context because
+ // we use it to check that fonts have been properly added when requesting glyphs.
+ font_contexts.lock_shared_context().add_font(&font_key, &template);
+
+ // TODO: this locks each font context while adding the font data, probably not a big deal,
+ // but if there is contention on this lock we could easily have a queue of per-context
+ // operations to add and delete fonts, and have these queues lazily processed by each worker
+ // before rendering a glyph.
+ // We can also move this into a worker to free up some cycles in the calling (render backend)
+ // thread.
+ for i in 0..font_contexts.num_worker_contexts() {
+ font_contexts.lock_context(Some(i)).add_font(&font_key, &template);
+ }
+ }
+
+ pub fn delete_font(&mut self, font_key: FontKey) {
+ self.fonts_to_remove.push(font_key);
+ }
+
+ pub fn request_glyphs(
+ &mut self,
+ glyph_cache: &mut GlyphCache,
+ current_frame_id: FrameId,
+ font_key: FontKey,
+ size: Au,
+ color: ColorF,
+ glyph_instances: &[GlyphInstance],
+ render_mode: FontRenderMode,
+ glyph_options: Option<GlyphOptions>,
+ ) {
+ assert!(self.font_contexts.lock_shared_context().has_font(&font_key));
+
+ let mut glyphs = Vec::with_capacity(glyph_instances.len());
+
+ {
+ // TODO: If this takes too long we can resurect a dedicated glyph
+ // dispatch thread, hopefully not.
+ profile_scope!("glyph-requests");
+
+ // select glyphs that have not been requested yet.
+ for glyph in glyph_instances {
+ let glyph_request = GlyphRequest::new(
+ font_key,
+ size,
+ color,
+ glyph.index,
+ glyph.point,
+ render_mode,
+ glyph_options,
+ );
+
+ glyph_cache.mark_as_needed(&glyph_request, current_frame_id);
+ if !glyph_cache.contains_key(&glyph_request) && !self.pending_glyphs.contains(&glyph_request) {
+ self.pending_glyphs.insert(glyph_request.clone());
+ glyphs.push(glyph_request);
+ }
+ }
+ }
+
+ if glyphs.is_empty() {
+ return;
+ }
+
+ let font_contexts = Arc::clone(&self.font_contexts);
+ let glyph_tx = self.glyph_tx.clone();
+ // spawn an async task to get off of the render backend thread as early as
+ // possible and in that task use rayon's fork join dispatch to rasterize the
+ // glyphs in the thread pool.
+ self.workers.spawn_async(move || {
+ let jobs = glyphs.par_iter().map(|request: &GlyphRequest| {
+ profile_scope!("glyph-raster");
+ let mut context = font_contexts.lock_current_context();
+ let job = GlyphRasterJob {
+ request: request.clone(),
+ result: context.rasterize_glyph(
+ &request.key,
+ request.render_mode,
+ request.glyph_options
+ ),
+ };
+
+ // Sanity check.
+ if let Some(ref glyph) = job.result {
+ let bpp = 4; // We always render glyphs in 32 bits RGBA format.
+ assert_eq!(glyph.bytes.len(), bpp * (glyph.width * glyph.height) as usize);
+ }
+
+ job
+ }).collect();
+
+ glyph_tx.send(jobs).unwrap();
+ });
+ }
+
+ pub fn get_glyph_dimensions(&mut self, glyph_key: &GlyphKey) -> Option<GlyphDimensions> {
+ self.font_contexts.lock_shared_context().get_glyph_dimensions(glyph_key)
+ }
+
+ pub fn resolve_glyphs(
+ &mut self,
+ current_frame_id: FrameId,
+ glyph_cache: &mut GlyphCache,
+ texture_cache: &mut TextureCache,
+ texture_cache_profile: &mut TextureCacheProfileCounters,
+ ) {
+ let mut rasterized_glyphs = Vec::with_capacity(self.pending_glyphs.len());
+
+ // Pull rasterized glyphs from the queue.
+ while !self.pending_glyphs.is_empty() {
+ // TODO: rather than blocking until all pending glyphs are available
+ // we could try_recv and steal work from the thread pool to take advantage
+ // of the fact that this thread is alive and we avoid the added latency
+ // of blocking it.
+ let raster_jobs = self.glyph_rx.recv().expect("BUG: Should be glyphs pending!");
+ for job in raster_jobs {
+ debug_assert!(self.pending_glyphs.contains(&job.request));
+ self.pending_glyphs.remove(&job.request);
+
+ rasterized_glyphs.push(job);
+ }
+ }
+
+ // Ensure that the glyphs are always processed in the same
+ // order for a given text run (since iterating a hash set doesn't
+ // guarantee order). This can show up as very small float inaccuacry
+ // differences in rasterizers due to the different coordinates
+ // that text runs get associated with by the texture cache allocator.
+ rasterized_glyphs.sort_by(|a, b| a.request.cmp(&b.request));
+
+ // Update the caches.
+ for job in rasterized_glyphs {
+ let image_id = job.result.and_then(
+ |glyph| if glyph.width > 0 && glyph.height > 0 {
+ let image_id = texture_cache.new_item_id();
+ texture_cache.insert(
+ image_id,
+ ImageDescriptor {
+ width: glyph.width,
+ height: glyph.height,
+ stride: None,
+ format: ImageFormat::RGBA8,
+ is_opaque: false,
+ offset: 0,
+ },
+ TextureFilter::Linear,
+ ImageData::Raw(Arc::new(glyph.bytes)),
+ texture_cache_profile,
+ );
+ Some(image_id)
+ } else {
+ None
+ }
+ );
+
+ glyph_cache.insert(job.request, image_id, current_frame_id);
+ }
+
+ // Now that we are done with the critical path (rendering the glyphs),
+ // we can schedule removing the fonts if needed.
+ if !self.fonts_to_remove.is_empty() {
+ let font_contexts = Arc::clone(&self.font_contexts);
+ let fonts_to_remove = mem::replace(&mut self.fonts_to_remove, Vec::new());
+ self.workers.spawn_async(move || {
+ for font_key in &fonts_to_remove {
+ font_contexts.lock_shared_context().delete_font(font_key);
+ }
+ for i in 0..font_contexts.num_worker_contexts() {
+ let mut context = font_contexts.lock_context(Some(i));
+ for font_key in &fonts_to_remove {
+ context.delete_font(font_key);
+ }
+ }
+ });
+ }
+ }
+}
+
+impl FontContext {
+ fn add_font(&mut self, font_key: &FontKey, template: &FontTemplate) {
+ match template {
+ &FontTemplate::Raw(ref bytes, index) => {
+ self.add_raw_font(&font_key, &**bytes, index);
+ }
+ &FontTemplate::Native(ref native_font_handle) => {
+ self.add_native_font(&font_key, (*native_font_handle).clone());
+ }
+ }
+ }
+}
+
+#[derive(Clone, Hash, PartialEq, Eq, Debug, Ord, PartialOrd)]
+pub struct GlyphRequest {
+ pub key: GlyphKey,
+ pub render_mode: FontRenderMode,
+ pub glyph_options: Option<GlyphOptions>,
+}
+
+impl GlyphRequest {
+ pub fn new(
+ font_key: FontKey,
+ size: Au,
+ color: ColorF,
+ index: u32,
+ point: LayoutPoint,
+ render_mode: FontRenderMode,
+ glyph_options: Option<GlyphOptions>,
+ ) -> GlyphRequest {
+ GlyphRequest {
+ key: GlyphKey::new(font_key, size, color, index, point, render_mode),
+ render_mode: render_mode,
+ glyph_options: glyph_options,
+ }
+ }
+}
+
+struct GlyphRasterJob {
+ request: GlyphRequest,
+ result: Option<RasterizedGlyph>,
+}
+
+#[test]
+fn raterize_200_glyphs() {
+ // This test loads a font from disc, the renders 4 requests containing
+ // 50 glyphs each, deletes the font and waits for the result.
+
+ use rayon::Configuration;
+ use std::fs::File;
+ use std::io::Read;
+
+ let workers = Arc::new(ThreadPool::new(Configuration::new()).unwrap());
+ let mut glyph_rasterizer = GlyphRasterizer::new(workers);
+ let mut glyph_cache = GlyphCache::new();
+
+ let mut font_file = File::open("../wrench/reftests/text/VeraBd.ttf").expect("Couldn't open font file");
+ let mut font_data = vec![];
+ font_file.read_to_end(&mut font_data).expect("failed to read font file");
+
+ let font_key = FontKey::new(0, 0);
+ glyph_rasterizer.add_font(font_key, FontTemplate::Raw(Arc::new(font_data), 0));
+
+ let frame_id = FrameId(1);
+
+ let mut glyph_instances = Vec::with_capacity(200);
+ for i in 0..200 {
+ glyph_instances.push(GlyphInstance {
+ index: i, // It doesn't matter which glyphs we are actually rendering.
+ point: LayoutPoint::new(0.0, 0.0),
+ });
+ }
+
+ for i in 0..4 {
+ glyph_rasterizer.request_glyphs(
+ &mut glyph_cache,
+ frame_id,
+ font_key,
+ Au::from_px(32),
+ ColorF::new(0.0, 0.0, 0.0, 1.0),
+ &glyph_instances[(50 * i)..(50 * (i + 1))],
+ FontRenderMode::Subpixel,
+ None,
+ );
+ }
+
+ glyph_rasterizer.delete_font(font_key);
+
+ glyph_rasterizer.resolve_glyphs(
+ frame_id,
+ &mut glyph_cache,
+ &mut TextureCache::new(4096),
+ &mut TextureCacheProfileCounters::new(),
+ );
+}
--- a/gfx/webrender/src/lib.rs
+++ b/gfx/webrender/src/lib.rs
@@ -52,16 +52,17 @@ mod debug_colors;
mod debug_font_data;
mod debug_render;
mod device;
mod ellipse;
mod frame;
mod frame_builder;
mod freelist;
mod geometry;
+mod glyph_rasterizer;
mod gpu_store;
mod internal_types;
mod mask_cache;
mod prim_store;
mod print_tree;
mod profiler;
mod record;
mod render_backend;
--- a/gfx/webrender/src/platform/macos/font.rs
+++ b/gfx/webrender/src/platform/macos/font.rs
@@ -21,16 +21,20 @@ use webrender_traits::NativeFontHandle;
use gamma_lut::{GammaLut, Color as ColorLut};
pub struct FontContext {
cg_fonts: HashMap<FontKey, CGFont>,
ct_fonts: HashMap<(FontKey, Au), CTFont>,
gamma_lut: GammaLut,
}
+// core text is safe to use on multiple threads and non-shareable resources are
+// all hidden inside their font context.
+unsafe impl Send for FontContext {}
+
pub struct RasterizedGlyph {
pub width: u32,
pub height: u32,
pub bytes: Vec<u8>,
}
impl RasterizedGlyph {
pub fn blank() -> RasterizedGlyph {
@@ -71,16 +75,32 @@ fn supports_subpixel_aa() -> bool {
data[0] != data[1] || data[1] != data[2]
}
fn get_glyph_metrics(ct_font: &CTFont,
glyph: CGGlyph,
subpixel_point: &SubpixelPoint) -> GlyphMetrics {
let bounds = ct_font.get_bounding_rects_for_glyphs(kCTFontDefaultOrientation, &[glyph]);
+ if bounds.origin.x.is_nan() || bounds.origin.y.is_nan() ||
+ bounds.size.width.is_nan() || bounds.size.height.is_nan() {
+ // If an unexpected glyph index is requested, core text will return NaN values
+ // which causes us to do bad thing as the value is cast into an integer and
+ // overflow when expanding the bounds a few lines below.
+ // Instead we are better off returning zero-sized metrics because this special
+ // case is handled by the callers of this method.
+ return GlyphMetrics {
+ rasterized_left: 0,
+ rasterized_width: 0,
+ rasterized_height: 0,
+ rasterized_ascent: 0,
+ rasterized_descent: 0,
+ };
+ }
+
let (x_offset, y_offset) = subpixel_point.to_f64();
// First round out to pixel boundaries
// CG Origin is bottom left
let mut left = bounds.origin.x.floor() as i32;
let mut bottom = bounds.origin.y.floor() as i32;
let mut right = (bounds.origin.x
+ bounds.size.width
@@ -122,16 +142,20 @@ impl FontContext {
FontContext {
cg_fonts: HashMap::new(),
ct_fonts: HashMap::new(),
gamma_lut: GammaLut::new(contrast, gamma, gamma),
}
}
+ pub fn has_font(&self, font_key: &FontKey) -> bool {
+ self.cg_fonts.contains_key(font_key)
+ }
+
pub fn add_raw_font(&mut self, font_key: &FontKey, bytes: &[u8], index: u32) {
if self.cg_fonts.contains_key(font_key) {
return
}
assert_eq!(index, 0);
let data_provider = CGDataProvider::from_buffer(bytes);
let cg_font = match CGFont::from_data_provider(data_provider) {
--- a/gfx/webrender/src/platform/unix/font.rs
+++ b/gfx/webrender/src/platform/unix/font.rs
@@ -22,16 +22,21 @@ struct Face {
face: FT_Face,
}
pub struct FontContext {
lib: FT_Library,
faces: HashMap<FontKey, Face>,
}
+// FreeType resources are safe to move between threads as long as they
+// are not concurrently accessed. In our case, everything is hidden inside
+// a given FontContext so it is safe to move the latter between threads.
+unsafe impl Send for FontContext {}
+
pub struct RasterizedGlyph {
pub width: u32,
pub height: u32,
pub bytes: Vec<u8>,
}
fn float_to_fixed(before: usize, f: f64) -> i32 {
((1i32 << before) as f64 * f) as i32
@@ -58,16 +63,20 @@ impl FontContext {
}
FontContext {
lib: lib,
faces: HashMap::new(),
}
}
+ pub fn has_font(&self, font_key: &FontKey) -> bool {
+ self.faces.contains_key(font_key)
+ }
+
pub fn add_raw_font(&mut self, font_key: &FontKey, bytes: &[u8], index: u32) {
if !self.faces.contains_key(&font_key) {
let mut face: FT_Face = ptr::null_mut();
let result = unsafe {
FT_New_Memory_Face(self.lib,
bytes.as_ptr(),
bytes.len() as FT_Long,
index as FT_Long,
@@ -166,17 +175,21 @@ impl FontContext {
};
let result = unsafe { FT_Render_Glyph(slot, render_mode) };
if result != SUCCESS {
error!("Unable to rasterize {:?} with {:?}, {:?}", key, render_mode, result);
return None;
}
- let dimensions = Self::get_glyph_dimensions_impl(slot).unwrap();
+ let dimensions = match Self::get_glyph_dimensions_impl(slot) {
+ Some(val) => val,
+ None => return None,
+ };
+
let bitmap = unsafe { &(*slot).bitmap };
let pixel_mode = unsafe { mem::transmute(bitmap.pixel_mode as u32) };
info!("Rasterizing {:?} as {:?} with dimensions {:?}", key, render_mode, dimensions);
// we may be filling only a part of the buffer, so initialize the whole thing with 0
let mut final_buffer = Vec::with_capacity(dimensions.width as usize *
dimensions.height as usize *
4);
--- a/gfx/webrender/src/platform/windows/font.rs
+++ b/gfx/webrender/src/platform/windows/font.rs
@@ -19,16 +19,20 @@ lazy_static! {
}
pub struct FontContext {
fonts: HashMap<FontKey, dwrote::FontFace>,
gamma_lut: GammaLut,
gdi_gamma_lut: GammaLut,
}
+// DirectWrite is safe to use on multiple threads and non-shareable resources are
+// all hidden inside their font context.
+unsafe impl Send for FontContext {}
+
pub struct RasterizedGlyph {
pub width: u32,
pub height: u32,
pub bytes: Vec<u8>,
}
fn dwrite_texture_type(render_mode: FontRenderMode) ->
dwrote::DWRITE_TEXTURE_TYPE {
@@ -112,16 +116,20 @@ impl FontContext {
let gdi_gamma = 2.3;
FontContext {
fonts: HashMap::new(),
gamma_lut: GammaLut::new(contrast, gamma, gamma),
gdi_gamma_lut: GammaLut::new(contrast, gdi_gamma, gdi_gamma),
}
}
+ pub fn has_font(&self, font_key: &FontKey) -> bool {
+ self.fonts.contains_key(font_key)
+ }
+
pub fn add_raw_font(&mut self, font_key: &FontKey, data: &[u8], index: u32) {
if self.fonts.contains_key(font_key) {
return
}
if let Some(font_file) = dwrote::FontFile::new_from_data(data) {
let face = font_file.create_face(index, dwrote::DWRITE_FONT_SIMULATIONS_NONE);
self.fonts.insert((*font_key).clone(), face);
@@ -266,19 +274,21 @@ impl FontContext {
render_mode,
glyph_options);
let texture_type = dwrite_texture_type(render_mode);
let bounds = analysis.get_alpha_texture_bounds(texture_type);
let width = (bounds.right - bounds.left) as usize;
let height = (bounds.bottom - bounds.top) as usize;
- // We should not get here since glyph_dimensions would return
- // None for empty glyphs.
- assert!(width > 0 && height > 0);
+ // Alpha texture bounds can sometimes return an empty rect
+ // Such as for spaces
+ if width == 0 || height == 0 {
+ return None;
+ }
let mut pixels = analysis.create_alpha_texture(texture_type, bounds);
if render_mode != FontRenderMode::Mono {
let lut_correction = match glyph_options {
Some(option) => {
if option.force_gdi_rendering {
&self.gdi_gamma_lut
--- a/gfx/webrender/src/prim_store.rs
+++ b/gfx/webrender/src/prim_store.rs
@@ -192,16 +192,18 @@ pub struct YuvImagePrimitiveCpu {
// All textures should be the same type here.
pub yuv_texture_id: [SourceTexture; 3],
pub format: YuvFormat,
pub color_space: YuvColorSpace,
// The first address of yuv resource_address. Use "yuv_resource_address + N-th" to get the N-th channel data.
// e.g. yuv_resource_address + 0 => y channel resource_address
pub yuv_resource_address: GpuStoreAddress,
+
+ pub image_rendering: ImageRendering,
}
#[derive(Debug, Clone)]
#[repr(C)]
pub struct YuvImagePrimitiveGpu {
pub size: LayerSize,
pub padding: [f32; 2],
}
@@ -1087,17 +1089,17 @@ impl PrimitiveStore {
// by the render thread.
let resource_address = image_cpu.yuv_resource_address + channel as i32;
let (texture_id, cache_item) =
PrimitiveStore::resolve_image(resource_cache,
&mut deferred_resolves,
image_cpu.yuv_key[channel],
resource_address,
- ImageRendering::Auto,
+ image_cpu.image_rendering,
None);
// texture_id
image_cpu.yuv_texture_id[channel] = texture_id;
// uv coordinates
if let Some(cache_item) = cache_item {
let resource_rect = self.gpu_resource_rects.get_mut(image_cpu.yuv_resource_address + channel as i32);
resource_rect.uv0 = cache_item.uv0;
resource_rect.uv1 = cache_item.uv1;
@@ -1325,17 +1327,17 @@ impl PrimitiveStore {
}
PrimitiveKind::YuvImage => {
let image_cpu = &mut self.cpu_yuv_images[metadata.cpu_prim_index.0];
prim_needs_resolve = true;
let channel_num = image_cpu.format.get_plane_num();
debug_assert!(channel_num <= 3);
for channel in 0..channel_num {
- resource_cache.request_image(image_cpu.yuv_key[channel], ImageRendering::Auto, None);
+ resource_cache.request_image(image_cpu.yuv_key[channel], image_cpu.image_rendering, None);
}
// TODO(nical): Currently assuming no tile_spacing for yuv images.
metadata.is_opaque = true;
}
PrimitiveKind::AlignedGradient => {
let gradient = &mut self.cpu_gradients[metadata.cpu_prim_index.0];
if gradient.cache_dirty {
--- a/gfx/webrender/src/renderer.rs
+++ b/gfx/webrender/src/renderer.rs
@@ -60,18 +60,18 @@ use webrender_traits::{YuvColorSpace, Yu
use webrender_traits::{YUV_COLOR_SPACES, YUV_FORMATS};
pub const GPU_DATA_TEXTURE_POOL: usize = 5;
pub const MAX_VERTEX_TEXTURE_WIDTH: usize = 1024;
const GPU_TAG_CACHE_BOX_SHADOW: GpuProfileTag = GpuProfileTag { label: "C_BoxShadow", color: debug_colors::BLACK };
const GPU_TAG_CACHE_CLIP: GpuProfileTag = GpuProfileTag { label: "C_Clip", color: debug_colors::PURPLE };
const GPU_TAG_CACHE_TEXT_RUN: GpuProfileTag = GpuProfileTag { label: "C_TextRun", color: debug_colors::MISTYROSE };
-const GPU_TAG_INIT: GpuProfileTag = GpuProfileTag { label: "Init", color: debug_colors::WHITE };
-const GPU_TAG_SETUP_TARGET: GpuProfileTag = GpuProfileTag { label: "Target", color: debug_colors::SLATEGREY };
+const GPU_TAG_SETUP_TARGET: GpuProfileTag = GpuProfileTag { label: "target", color: debug_colors::SLATEGREY };
+const GPU_TAG_SETUP_DATA: GpuProfileTag = GpuProfileTag { label: "data init", color: debug_colors::LIGHTGREY };
const GPU_TAG_PRIM_RECT: GpuProfileTag = GpuProfileTag { label: "Rect", color: debug_colors::RED };
const GPU_TAG_PRIM_IMAGE: GpuProfileTag = GpuProfileTag { label: "Image", color: debug_colors::GREEN };
const GPU_TAG_PRIM_YUV_IMAGE: GpuProfileTag = GpuProfileTag { label: "YuvImage", color: debug_colors::DARKGREEN };
const GPU_TAG_PRIM_BLEND: GpuProfileTag = GpuProfileTag { label: "Blend", color: debug_colors::LIGHTBLUE };
const GPU_TAG_PRIM_HW_COMPOSITE: GpuProfileTag = GpuProfileTag { label: "HwComposite", color: debug_colors::DODGERBLUE };
const GPU_TAG_PRIM_SPLIT_COMPOSITE: GpuProfileTag = GpuProfileTag { label: "SplitComposite", color: debug_colors::DARKBLUE };
const GPU_TAG_PRIM_COMPOSITE: GpuProfileTag = GpuProfileTag { label: "Composite", color: debug_colors::MAGENTA };
const GPU_TAG_PRIM_TEXT_RUN: GpuProfileTag = GpuProfileTag { label: "TextRun", color: debug_colors::BLUE };
@@ -570,16 +570,17 @@ pub struct Renderer {
ps_composite: LazilyCompiledShader,
notifier: Arc<Mutex<Option<Box<RenderNotifier>>>>,
enable_profiler: bool,
max_recorded_profiles: usize,
clear_framebuffer: bool,
clear_color: ColorF,
+ enable_clear_scissor: bool,
debug: DebugRenderer,
render_target_debug: bool,
enable_batcher: bool,
backend_profile_counters: BackendProfileCounters,
profile_counters: RendererProfileCounters,
profiler: Profiler,
last_time: u64,
@@ -1050,19 +1051,22 @@ impl Renderer {
};
let default_font_render_mode = match (options.enable_aa, options.enable_subpixel_aa) {
(true, true) => FontRenderMode::Subpixel,
(true, false) => FontRenderMode::Alpha,
(false, _) => FontRenderMode::Mono,
};
- let config = FrameBuilderConfig::new(options.enable_scrollbars,
- default_font_render_mode,
- options.debug);
+ let config = FrameBuilderConfig {
+ enable_scrollbars: options.enable_scrollbars,
+ default_font_render_mode,
+ debug: options.debug,
+ cache_expiry_frames: options.cache_expiry_frames,
+ };
let device_pixel_ratio = options.device_pixel_ratio;
let render_target_debug = options.render_target_debug;
let payload_tx_for_backend = payload_tx.clone();
let recorder = options.recorder;
let worker_config = ThreadPoolConfig::new().thread_name(|idx|{ format!("WebRender:Worker#{}", idx) });
let workers = options.workers.take().unwrap_or_else(||{
Arc::new(ThreadPool::new(worker_config).unwrap())
@@ -1125,16 +1129,17 @@ impl Renderer {
enable_batcher: options.enable_batcher,
backend_profile_counters: BackendProfileCounters::new(),
profile_counters: RendererProfileCounters::new(),
profiler: Profiler::new(),
enable_profiler: options.enable_profiler,
max_recorded_profiles: options.max_recorded_profiles,
clear_framebuffer: options.clear_framebuffer,
clear_color: options.clear_color,
+ enable_clear_scissor: options.enable_clear_scissor,
last_time: 0,
color_render_targets: Vec::new(),
alpha_render_targets: Vec::new(),
gpu_profile: gpu_profile,
prim_vao_id: prim_vao_id,
blur_vao_id: blur_vao_id,
clip_vao_id: clip_vao_id,
gdt_index: 0,
@@ -1271,41 +1276,46 @@ impl Renderer {
/// [newframe]: ../../webrender_traits/struct.RenderApi.html#method.set_display_list
pub fn render(&mut self, framebuffer_size: DeviceUintSize) {
profile_scope!("render");
if let Some(mut frame) = self.current_frame.take() {
if let Some(ref mut frame) = frame.frame {
let mut profile_timers = RendererProfileTimers::new();
- // Block CPU waiting for last frame's GPU profiles to arrive.
- // In general this shouldn't block unless heavily GPU limited.
- if let Some((gpu_frame_id, samples)) = self.gpu_profile.build_samples() {
- if self.max_recorded_profiles > 0 {
- while self.gpu_profiles.len() >= self.max_recorded_profiles {
- self.gpu_profiles.pop_front();
+ {
+ //Note: avoiding `self.gpu_profile.add_marker` - it would block here
+ let _gm = GpuMarker::new(self.device.rc_gl(), "build samples");
+ // Block CPU waiting for last frame's GPU profiles to arrive.
+ // In general this shouldn't block unless heavily GPU limited.
+ if let Some((gpu_frame_id, samples)) = self.gpu_profile.build_samples() {
+ if self.max_recorded_profiles > 0 {
+ while self.gpu_profiles.len() >= self.max_recorded_profiles {
+ self.gpu_profiles.pop_front();
+ }
+ self.gpu_profiles.push_back(GpuProfile::new(gpu_frame_id, &samples));
}
- self.gpu_profiles.push_back(GpuProfile::new(gpu_frame_id, &samples));
+ profile_timers.gpu_samples = samples;
}
- profile_timers.gpu_samples = samples;
}
let cpu_frame_id = profile_timers.cpu_time.profile(|| {
- let cpu_frame_id = self.device.begin_frame(frame.device_pixel_ratio);
- self.gpu_profile.begin_frame(cpu_frame_id);
- {
- let _gm = self.gpu_profile.add_marker(GPU_TAG_INIT);
+ let cpu_frame_id = {
+ let _gm = GpuMarker::new(self.device.rc_gl(), "begin frame");
+ let frame_id = self.device.begin_frame(frame.device_pixel_ratio);
+ self.gpu_profile.begin_frame(frame_id);
self.device.disable_scissor();
self.device.disable_depth();
self.device.set_blend(false);
-
//self.update_shaders();
self.update_texture_cache();
- }
+
+ frame_id
+ };
self.draw_tile_frame(frame, &framebuffer_size);
self.gpu_profile.end_frame();
cpu_frame_id
});
let current_time = precise_time_ns();
@@ -1332,17 +1342,20 @@ impl Renderer {
}
self.profile_counters.reset();
self.profile_counters.frame_counter.inc();
let debug_size = DeviceUintSize::new(framebuffer_size.width as u32,
framebuffer_size.height as u32);
self.debug.render(&mut self.device, &debug_size);
- self.device.end_frame();
+ {
+ let _gm = GpuMarker::new(self.device.rc_gl(), "end frame");
+ self.device.end_frame();
+ }
self.last_time = current_time;
}
// Restore frame - avoid borrow checker!
self.current_frame = Some(frame);
}
}
@@ -1688,27 +1701,27 @@ impl Renderer {
{
let _gm = self.gpu_profile.add_marker(GPU_TAG_SETUP_TARGET);
self.device.bind_draw_target(render_target, Some(target_size));
self.device.disable_depth();
self.device.enable_depth_write();
self.device.set_blend(false);
self.device.set_blend_mode_alpha();
match render_target {
- Some(..) => {
+ Some(..) if self.enable_clear_scissor => {
// TODO(gw): Applying a scissor rect and minimal clear here
// is a very large performance win on the Intel and nVidia
// GPUs that I have tested with. It's possible it may be a
// performance penalty on other GPU types - we should test this
// and consider different code paths.
self.device.clear_target_rect(clear_color,
Some(1.0),
target.used_rect());
}
- None => {
+ _ => {
self.device.clear_target(clear_color, Some(1.0));
}
}
self.device.disable_depth_write();
}
// Draw any blurs for this target.
@@ -1963,16 +1976,76 @@ impl Renderer {
.expect("Found external image, but no handler set!");
for (ext_data, _) in self.external_images.drain() {
handler.unlock(ext_data.0, ext_data.1);
}
}
}
+ fn start_frame(&mut self, frame: &mut Frame) {
+ let _gm = self.gpu_profile.add_marker(GPU_TAG_SETUP_DATA);
+
+ // Assign render targets to the passes.
+ for pass in &mut frame.passes {
+ debug_assert!(pass.color_texture_id.is_none());
+ debug_assert!(pass.alpha_texture_id.is_none());
+
+ if pass.needs_render_target_kind(RenderTargetKind::Color) {
+ pass.color_texture_id = Some(self.color_render_targets
+ .pop()
+ .unwrap_or_else(|| {
+ self.device
+ .create_texture_ids(1, TextureTarget::Array)[0]
+ }));
+ }
+
+ if pass.needs_render_target_kind(RenderTargetKind::Alpha) {
+ pass.alpha_texture_id = Some(self.alpha_render_targets
+ .pop()
+ .unwrap_or_else(|| {
+ self.device
+ .create_texture_ids(1, TextureTarget::Array)[0]
+ }));
+ }
+ }
+
+
+ // Init textures and render targets to match this scene.
+ for pass in &frame.passes {
+ if let Some(texture_id) = pass.color_texture_id {
+ let target_count = pass.required_target_count(RenderTargetKind::Color);
+ self.device.init_texture(texture_id,
+ frame.cache_size.width as u32,
+ frame.cache_size.height as u32,
+ ImageFormat::RGBA8,
+ TextureFilter::Linear,
+ RenderTargetMode::LayerRenderTarget(target_count as i32),
+ None);
+ }
+ if let Some(texture_id) = pass.alpha_texture_id {
+ let target_count = pass.required_target_count(RenderTargetKind::Alpha);
+ self.device.init_texture(texture_id,
+ frame.cache_size.width as u32,
+ frame.cache_size.height as u32,
+ ImageFormat::A8,
+ TextureFilter::Nearest,
+ RenderTargetMode::LayerRenderTarget(target_count as i32),
+ None);
+ }
+ }
+
+ // TODO(gw): This is a hack / workaround for #728.
+ // We should find a better way to implement these updates rather
+ // than wasting this extra memory, but for now it removes a large
+ // number of driver stalls.
+ self.gpu_data_textures[self.gdt_index].init_frame(&mut self.device, frame);
+ self.gdt_index = (self.gdt_index + 1) % GPU_DATA_TEXTURE_POOL;
+ }
+
fn draw_tile_frame(&mut self,
frame: &mut Frame,
framebuffer_size: &DeviceUintSize) {
let _gm = GpuMarker::new(self.device.rc_gl(), "tile frame draw");
self.update_deferred_resolves(frame);
// Some tests use a restricted viewport smaller than the main screen size.
// Ensure we clear the framebuffer in these tests.
@@ -1982,70 +2055,17 @@ impl Renderer {
self.device.disable_depth_write();
self.device.disable_stencil();
self.device.set_blend(false);
if frame.passes.is_empty() {
self.device.clear_target(Some(self.clear_color.to_array()), Some(1.0));
} else {
- // Assign render targets to the passes.
- for pass in &mut frame.passes {
- debug_assert!(pass.color_texture_id.is_none());
- debug_assert!(pass.alpha_texture_id.is_none());
-
- if pass.needs_render_target_kind(RenderTargetKind::Color) {
- pass.color_texture_id = Some(self.color_render_targets
- .pop()
- .unwrap_or_else(|| {
- self.device
- .create_texture_ids(1, TextureTarget::Array)[0]
- }));
- }
-
- if pass.needs_render_target_kind(RenderTargetKind::Alpha) {
- pass.alpha_texture_id = Some(self.alpha_render_targets
- .pop()
- .unwrap_or_else(|| {
- self.device
- .create_texture_ids(1, TextureTarget::Array)[0]
- }));
- }
- }
-
- // Init textures and render targets to match this scene.
- for pass in &frame.passes {
- if let Some(texture_id) = pass.color_texture_id {
- let target_count = pass.required_target_count(RenderTargetKind::Color);
- self.device.init_texture(texture_id,
- frame.cache_size.width as u32,
- frame.cache_size.height as u32,
- ImageFormat::RGBA8,
- TextureFilter::Linear,
- RenderTargetMode::LayerRenderTarget(target_count as i32),
- None);
- }
- if let Some(texture_id) = pass.alpha_texture_id {
- let target_count = pass.required_target_count(RenderTargetKind::Alpha);
- self.device.init_texture(texture_id,
- frame.cache_size.width as u32,
- frame.cache_size.height as u32,
- ImageFormat::A8,
- TextureFilter::Nearest,
- RenderTargetMode::LayerRenderTarget(target_count as i32),
- None);
- }
- }
-
- // TODO(gw): This is a hack / workaround for #728.
- // We should find a better way to implement these updates rather
- // than wasting this extra memory, but for now it removes a large
- // number of driver stalls.
- self.gpu_data_textures[self.gdt_index].init_frame(&mut self.device, frame);
- self.gdt_index = (self.gdt_index + 1) % GPU_DATA_TEXTURE_POOL;
+ self.start_frame(frame);
let mut src_color_id = self.dummy_cache_texture_id;
let mut src_alpha_id = self.dummy_cache_texture_id;
for pass in &mut frame.passes {
let size;
let clear_color;
let projection;
@@ -2252,19 +2272,21 @@ pub struct RendererOptions {
pub max_recorded_profiles: usize,
pub debug: bool,
pub enable_scrollbars: bool,
pub precache_shaders: bool,
pub renderer_kind: RendererKind,
pub enable_subpixel_aa: bool,
pub clear_framebuffer: bool,
pub clear_color: ColorF,
+ pub enable_clear_scissor: bool,
pub enable_batcher: bool,
pub render_target_debug: bool,
pub max_texture_size: Option<u32>,
+ pub cache_expiry_frames: u32,
pub workers: Option<Arc<ThreadPool>>,
pub blob_image_renderer: Option<Box<BlobImageRenderer>>,
pub recorder: Option<Box<ApiRecordingReceiver>>,
}
impl Default for RendererOptions {
fn default() -> RendererOptions {
RendererOptions {
@@ -2276,17 +2298,19 @@ impl Default for RendererOptions {
max_recorded_profiles: 0,
debug: false,
enable_scrollbars: false,
precache_shaders: false,
renderer_kind: RendererKind::Native,
enable_subpixel_aa: false,
clear_framebuffer: true,
clear_color: ColorF::new(1.0, 1.0, 1.0, 1.0),
+ enable_clear_scissor: true,
enable_batcher: true,
render_target_debug: false,
max_texture_size: None,
+ cache_expiry_frames: 600, // roughly, 10 seconds
workers: None,
blob_image_renderer: None,
recorder: None,
}
}
}
--- a/gfx/webrender/src/resource_cache.rs
+++ b/gfx/webrender/src/resource_cache.rs
@@ -2,103 +2,51 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use app_units::Au;
use device::TextureFilter;
use fnv::FnvHasher;
use frame::FrameId;
use internal_types::{FontTemplate, SourceTexture, TextureUpdateList};
-use platform::font::{FontContext, RasterizedGlyph};
use profiler::TextureCacheProfileCounters;
-use std::cell::RefCell;
use std::collections::{HashMap, HashSet};
use std::collections::hash_map::Entry::{self, Occupied, Vacant};
use std::fmt::Debug;
use std::hash::BuildHasherDefault;
use std::hash::Hash;
use std::mem;
-use std::sync::{Arc, Barrier};
-use std::sync::mpsc::{channel, Receiver, Sender};
-use std::thread;
+use std::sync::Arc;
use texture_cache::{TextureCache, TextureCacheItemId};
-use thread_profiler::register_thread_with_profiler;
-use webrender_traits::{Epoch, FontKey, GlyphKey, ImageKey, ImageFormat, ImageRendering};
+use webrender_traits::{Epoch, FontKey, GlyphKey, ImageKey, ImageRendering};
use webrender_traits::{FontRenderMode, ImageData, GlyphDimensions, WebGLContextId};
use webrender_traits::{DevicePoint, DeviceIntSize, DeviceUintRect, ImageDescriptor, ColorF};
use webrender_traits::{GlyphOptions, GlyphInstance, TileOffset, TileSize};
use webrender_traits::{BlobImageRenderer, BlobImageDescriptor, BlobImageError, BlobImageRequest, BlobImageData, ImageStore};
use webrender_traits::{ExternalImageData, ExternalImageType, LayoutPoint};
use rayon::ThreadPool;
+use glyph_rasterizer::{GlyphRasterizer, GlyphCache, GlyphRequest};
const DEFAULT_TILE_SIZE: TileSize = 512;
-thread_local!(pub static FONT_CONTEXT: RefCell<FontContext> = RefCell::new(FontContext::new()));
-
-type GlyphCache = ResourceClassCache<RenderedGlyphKey, Option<TextureCacheItemId>>;
-
-/// Message sent from the resource cache to the glyph cache thread.
-enum GlyphCacheMsg {
- /// Begin the frame - pass ownership of the glyph cache to the thread.
- BeginFrame(FrameId, GlyphCache),
- /// Add a new font.
- AddFont(FontKey, FontTemplate),
- /// Request glyphs for a text run.
- RequestGlyphs(FontKey, Au, ColorF, Vec<GlyphInstance>, FontRenderMode, Option<GlyphOptions>),
- // Remove an existing font.
- DeleteFont(FontKey),
- /// Finished requesting glyphs. Reply with new glyphs.
- EndFrame,
-}
-
-/// Results send from glyph cache thread back to main resource cache.
-enum GlyphCacheResultMsg {
- /// Return the glyph cache, and a list of newly rasterized glyphs.
- EndFrame(GlyphCache, Vec<GlyphRasterJob>),
-}
-
// These coordinates are always in texels.
// They are converted to normalized ST
// values in the vertex shader. The reason
// for this is that the texture may change
// dimensions (e.g. the pages in a texture
// atlas can grow). When this happens, by
// storing the coordinates as texel values
// we don't need to go through and update
// various CPU-side structures.
pub struct CacheItem {
pub texture_id: SourceTexture,
pub uv0: DevicePoint,
pub uv1: DevicePoint,
}
-#[derive(Clone, Hash, PartialEq, Eq, Debug, Ord, PartialOrd)]
-pub struct RenderedGlyphKey {
- pub key: GlyphKey,
- pub render_mode: FontRenderMode,
- pub glyph_options: Option<GlyphOptions>,
-}
-
-impl RenderedGlyphKey {
- pub fn new(font_key: FontKey,
- size: Au,
- color: ColorF,
- index: u32,
- point: LayoutPoint,
- render_mode: FontRenderMode,
- glyph_options: Option<GlyphOptions>) -> RenderedGlyphKey {
- RenderedGlyphKey {
- key: GlyphKey::new(font_key, size, color, index,
- point, render_mode),
- render_mode: render_mode,
- glyph_options: glyph_options,
- }
- }
-}
-
pub struct ImageProperties {
pub descriptor: ImageDescriptor,
pub external_image: Option<ExternalImageData>,
pub tiling: Option<TileSize>,
}
#[derive(Debug, Copy, Clone, PartialEq)]
enum State {
@@ -155,48 +103,48 @@ struct CachedImageInfo {
}
pub struct ResourceClassCache<K,V> {
resources: HashMap<K, V, BuildHasherDefault<FnvHasher>>,
last_access_times: HashMap<K, FrameId, BuildHasherDefault<FnvHasher>>,
}
impl<K,V> ResourceClassCache<K,V> where K: Clone + Hash + Eq + Debug, V: Resource {
- fn new() -> ResourceClassCache<K,V> {
+ pub fn new() -> ResourceClassCache<K,V> {
ResourceClassCache {
resources: HashMap::default(),
last_access_times: HashMap::default(),
}
}
- fn contains_key(&self, key: &K) -> bool {
+ pub fn contains_key(&self, key: &K) -> bool {
self.resources.contains_key(key)
}
fn get(&self, key: &K, frame: FrameId) -> &V {
// This assert catches cases in which we accidentally request a resource that we forgot to
// mark as needed this frame.
debug_assert_eq!(frame, *self.last_access_times
.get(key)
.expect("Didn't find the access time for a cached resource \
with that ID!"));
self.resources.get(key).expect("Didn't find a cached resource with that ID!")
}
- fn insert(&mut self, key: K, value: V, frame: FrameId) {
+ pub fn insert(&mut self, key: K, value: V, frame: FrameId) {
self.last_access_times.insert(key.clone(), frame);
self.resources.insert(key, value);
}
fn entry(&mut self, key: K, frame: FrameId) -> Entry<K,V> {
self.last_access_times.insert(key.clone(), frame);
self.resources.entry(key)
}
- fn mark_as_needed(&mut self, key: &K, frame: FrameId) {
+ pub fn mark_as_needed(&mut self, key: &K, frame: FrameId) {
self.last_access_times.insert((*key).clone(), frame);
}
fn expire_old_resources(&mut self, texture_cache: &mut TextureCache, frame_id: FrameId) {
let mut resources_to_destroy = vec![];
for (key, this_frame_id) in &self.last_access_times {
if *this_frame_id < frame_id {
resources_to_destroy.push((*key).clone())
@@ -227,69 +175,60 @@ impl Into<BlobImageRequest> for ImageReq
fn into(self) -> BlobImageRequest {
BlobImageRequest {
key: self.key,
tile: self.tile,
}
}
}
-struct GlyphRasterJob {
- key: RenderedGlyphKey,
- result: Option<RasterizedGlyph>,
-}
-
struct WebGLTexture {
id: SourceTexture,
size: DeviceIntSize,
}
pub struct ResourceCache {
- cached_glyphs: Option<GlyphCache>,
+ cached_glyphs: GlyphCache,
cached_images: ResourceClassCache<ImageRequest, CachedImageInfo>,
// TODO(pcwalton): Figure out the lifecycle of these.
webgl_textures: HashMap<WebGLContextId, WebGLTexture, BuildHasherDefault<FnvHasher>>,
font_templates: HashMap<FontKey, FontTemplate, BuildHasherDefault<FnvHasher>>,
image_templates: ImageTemplates,
state: State,
current_frame_id: FrameId,
texture_cache: TextureCache,
// TODO(gw): We should expire (parts of) this cache semi-regularly!
cached_glyph_dimensions: HashMap<GlyphKey, Option<GlyphDimensions>, BuildHasherDefault<FnvHasher>>,
pending_image_requests: Vec<ImageRequest>,
- glyph_cache_tx: Sender<GlyphCacheMsg>,
- glyph_cache_result_queue: Receiver<GlyphCacheResultMsg>,
+ glyph_rasterizer: GlyphRasterizer,
blob_image_renderer: Option<Box<BlobImageRenderer>>,
blob_image_requests: HashSet<ImageRequest>,
}
impl ResourceCache {
pub fn new(texture_cache: TextureCache,
workers: Arc<ThreadPool>,
blob_image_renderer: Option<Box<BlobImageRenderer>>) -> ResourceCache {
- let (glyph_cache_tx, glyph_cache_result_queue) = spawn_glyph_cache_thread(workers);
-
ResourceCache {
- cached_glyphs: Some(ResourceClassCache::new()),
+ cached_glyphs: ResourceClassCache::new(),
cached_images: ResourceClassCache::new(),
webgl_textures: HashMap::default(),
font_templates: HashMap::default(),
image_templates: ImageTemplates::new(),
cached_glyph_dimensions: HashMap::default(),
texture_cache: texture_cache,
state: State::Idle,
current_frame_id: FrameId(0),
pending_image_requests: Vec::new(),
- glyph_cache_tx: glyph_cache_tx,
- glyph_cache_result_queue: glyph_cache_result_queue,
+ glyph_rasterizer: GlyphRasterizer::new(workers),
blob_image_renderer: blob_image_renderer,
blob_image_requests: HashSet::new(),
}
}
pub fn max_texture_size(&self) -> u32 {
self.texture_cache.max_texture_size()
@@ -304,28 +243,24 @@ impl ResourceCache {
// External handles already represent existing textures so it does
// not make sense to tile them into smaller ones.
info.image_type == ExternalImageType::ExternalBuffer && size_check
},
}
}
pub fn add_font_template(&mut self, font_key: FontKey, template: FontTemplate) {
- // Push the new font to the glyph cache thread, and also store
+ // Push the new font to the font renderer, and also store
// it locally for glyph metric requests.
- self.glyph_cache_tx
- .send(GlyphCacheMsg::AddFont(font_key, template.clone()))
- .unwrap();
+ self.glyph_rasterizer.add_font(font_key, template.clone());
self.font_templates.insert(font_key, template);
}
pub fn delete_font_template(&mut self, font_key: FontKey) {
- self.glyph_cache_tx
- .send(GlyphCacheMsg::DeleteFont(font_key))
- .unwrap();
+ self.glyph_rasterizer.delete_font(font_key);
self.font_templates.remove(&font_key);
}
pub fn add_image_template(&mut self,
image_key: ImageKey,
descriptor: ImageDescriptor,
mut data: ImageData,
mut tiling: Option<TileSize>) {
@@ -487,55 +422,57 @@ impl ResourceCache {
pub fn request_glyphs(&mut self,
key: FontKey,
size: Au,
color: ColorF,
glyph_instances: &[GlyphInstance],
render_mode: FontRenderMode,
glyph_options: Option<GlyphOptions>) {
debug_assert_eq!(self.state, State::AddResources);
- // Immediately request that the glyph cache thread start
- // rasterizing glyphs from this request if they aren't
- // already cached.
- let msg = GlyphCacheMsg::RequestGlyphs(key,
- size,
- color,
- glyph_instances.to_vec(),
- render_mode,
- glyph_options);
- self.glyph_cache_tx.send(msg).unwrap();
+
+ self.glyph_rasterizer.request_glyphs(
+ &mut self.cached_glyphs,
+ self.current_frame_id,
+ key,
+ size,
+ color,
+ glyph_instances,
+ render_mode,
+ glyph_options,
+ );
}
pub fn pending_updates(&mut self) -> TextureUpdateList {
self.texture_cache.pending_updates()
}
pub fn get_glyphs<F>(&self,
font_key: FontKey,
size: Au,
color: ColorF,
glyph_instances: &[GlyphInstance],
render_mode: FontRenderMode,
glyph_options: Option<GlyphOptions>,
mut f: F) -> SourceTexture where F: FnMut(usize, DevicePoint, DevicePoint) {
debug_assert_eq!(self.state, State::QueryResources);
- let cache = self.cached_glyphs.as_ref().unwrap();
- let mut glyph_key = RenderedGlyphKey::new(font_key,
- size,
- color,
- 0,
- LayoutPoint::new(0.0, 0.0),
- render_mode,
- glyph_options);
+ let mut glyph_key = GlyphRequest::new(
+ font_key,
+ size,
+ color,
+ 0,
+ LayoutPoint::new(0.0, 0.0),
+ render_mode,
+ glyph_options
+ );
let mut texture_id = None;
for (loop_index, glyph_instance) in glyph_instances.iter().enumerate() {
glyph_key.key.index = glyph_instance.index;
glyph_key.key.subpixel_point.set_offset(glyph_instance.point, render_mode);
- let image_id = cache.get(&glyph_key, self.current_frame_id);
+ let image_id = self.cached_glyphs.get(&glyph_key, self.current_frame_id);
let cache_item = image_id.map(|image_id| self.texture_cache.get(image_id));
if let Some(cache_item) = cache_item {
let uv0 = DevicePoint::new(cache_item.pixel_rect.top_left.x as f32,
cache_item.pixel_rect.top_left.y as f32);
let uv1 = DevicePoint::new(cache_item.pixel_rect.bottom_right.x as f32,
cache_item.pixel_rect.bottom_right.y as f32);
f(loop_index, uv0, uv1);
debug_assert!(texture_id == None ||
@@ -546,35 +483,17 @@ impl ResourceCache {
texture_id.map_or(SourceTexture::Invalid, SourceTexture::TextureCache)
}
pub fn get_glyph_dimensions(&mut self, glyph_key: &GlyphKey) -> Option<GlyphDimensions> {
match self.cached_glyph_dimensions.entry(glyph_key.clone()) {
Occupied(entry) => *entry.get(),
Vacant(entry) => {
- let mut dimensions = None;
- let font_template = &self.font_templates[&glyph_key.font_key];
-
- FONT_CONTEXT.with(|font_context| {
- let mut font_context = font_context.borrow_mut();
- match *font_template {
- FontTemplate::Raw(ref bytes, index) => {
- font_context.add_raw_font(&glyph_key.font_key, &**bytes, index);
- }
- FontTemplate::Native(ref native_font_handle) => {
- font_context.add_native_font(&glyph_key.font_key,
- (*native_font_handle).clone());
- }
- }
-
- dimensions = font_context.get_glyph_dimensions(glyph_key);
- });
-
- *entry.insert(dimensions)
+ *entry.insert(self.glyph_rasterizer.get_glyph_dimensions(glyph_key))
}
}
}
#[inline]
pub fn get_cached_image(&self,
image_key: ImageKey,
image_rendering: ImageRendering,
@@ -633,83 +552,38 @@ impl ResourceCache {
}
pub fn get_webgl_texture_size(&self, context_id: &WebGLContextId) -> DeviceIntSize {
self.webgl_textures[context_id].size
}
pub fn expire_old_resources(&mut self, frame_id: FrameId) {
self.cached_images.expire_old_resources(&mut self.texture_cache, frame_id);
-
- let cached_glyphs = self.cached_glyphs.as_mut().unwrap();
- cached_glyphs.expire_old_resources(&mut self.texture_cache, frame_id);
+ self.cached_glyphs.expire_old_resources(&mut self.texture_cache, frame_id);
}
pub fn begin_frame(&mut self, frame_id: FrameId) {
debug_assert_eq!(self.state, State::Idle);
self.state = State::AddResources;
self.current_frame_id = frame_id;
- let glyph_cache = self.cached_glyphs.take().unwrap();
- self.glyph_cache_tx.send(GlyphCacheMsg::BeginFrame(frame_id, glyph_cache)).ok();
}
pub fn block_until_all_resources_added(&mut self,
texture_cache_profile: &mut TextureCacheProfileCounters) {
profile_scope!("block_until_all_resources_added");
debug_assert_eq!(self.state, State::AddResources);
self.state = State::QueryResources;
- // Tell the glyph cache thread that all glyphs have been requested
- // and block, waiting for any pending glyphs to be rasterized. In the
- // future, we will expand this to have a timeout. If the glyph rasterizing
- // takes longer than the timeout, then we will select the best glyphs
- // available in the cache, render with those, and then re-render at
- // a later point when the correct resolution glyphs finally become
- // available.
- self.glyph_cache_tx.send(GlyphCacheMsg::EndFrame).unwrap();
-
- // Loop until the end frame message is retrieved here. This loop
- // doesn't serve any real purpose right now, but in the future
- // it will be receiving small amounts of glyphs at a time, up until
- // it decides that it should just render the frame.
- while let Ok(result) = self.glyph_cache_result_queue.recv() {
- match result {
- GlyphCacheResultMsg::EndFrame(mut cache, glyph_jobs) => {
- // Add any newly rasterized glyphs to the texture cache.
- for job in glyph_jobs {
- let image_id = job.result.and_then(|glyph| {
- if glyph.width > 0 && glyph.height > 0 {
- let image_id = self.texture_cache.new_item_id();
- self.texture_cache.insert(image_id,
- ImageDescriptor {
- width: glyph.width,
- height: glyph.height,
- stride: None,
- format: ImageFormat::RGBA8,
- is_opaque: false,
- offset: 0,
- },
- TextureFilter::Linear,
- ImageData::Raw(Arc::new(glyph.bytes)),
- texture_cache_profile);
- Some(image_id)
- } else {
- None
- }
- });
-
- cache.insert(job.key, image_id, self.current_frame_id);
- }
-
- self.cached_glyphs = Some(cache);
- break;
- }
- }
- }
+ self.glyph_rasterizer.resolve_glyphs(
+ self.current_frame_id,
+ &mut self.cached_glyphs,
+ &mut self.texture_cache,
+ texture_cache_profile,
+ );
let mut image_requests = mem::replace(&mut self.pending_image_requests, Vec::new());
for request in image_requests.drain(..) {
self.finalize_image_request(request, None, texture_cache_profile);
}
let mut blob_image_requests = mem::replace(&mut self.blob_image_requests, HashSet::new());
if self.blob_image_renderer.is_some() {
@@ -872,184 +746,16 @@ impl Resource for Option<TextureCacheIte
}
impl Resource for CachedImageInfo {
fn texture_cache_item_id(&self) -> Option<TextureCacheItemId> {
Some(self.texture_cache_id)
}
}
-fn spawn_glyph_cache_thread(workers: Arc<ThreadPool>) -> (Sender<GlyphCacheMsg>, Receiver<GlyphCacheResultMsg>) {
- let worker_count = {
- workers.current_num_threads()
- };
- // Used for messages from resource cache -> glyph cache thread.
- let (msg_tx, msg_rx) = channel();
- // Used for returning results from glyph cache thread -> resource cache.
- let (result_tx, result_rx) = channel();
- // Used for rasterizer worker threads to send glyphs -> glyph cache thread.
- let (glyph_tx, glyph_rx) = channel();
-
- thread::Builder::new().name("GlyphCache".to_string()).spawn(move|| {
- let mut glyph_cache = None;
- let mut current_frame_id = FrameId(0);
-
- register_thread_with_profiler("GlyphCache".to_string());
-
- let barrier = Arc::new(Barrier::new(worker_count));
- for i in 0..worker_count {
- let barrier = Arc::clone(&barrier);
- workers.spawn_async(move || {
- register_thread_with_profiler(format!("Glyph Worker {}", i));
- barrier.wait();
- });
- }
-
- // Maintain a set of glyphs that have been requested this
- // frame. This ensures the glyph thread won't rasterize
- // the same glyph more than once in a frame. This is required
- // because the glyph cache hash table is not updated
- // until the glyph cache is passed back to the resource
- // cache which is able to add the items to the texture cache.
- let mut pending_glyphs = HashSet::new();
-
- while let Ok(msg) = msg_rx.recv() {
- profile_scope!("handle_msg");
- match msg {
- GlyphCacheMsg::BeginFrame(frame_id, cache) => {
- profile_scope!("BeginFrame");
-
- // We are beginning a new frame. Take ownership of the glyph
- // cache hash map, so we can easily see which glyph requests
- // actually need to be rasterized.
- current_frame_id = frame_id;
- glyph_cache = Some(cache);
- }
- GlyphCacheMsg::AddFont(font_key, font_template) => {
- profile_scope!("AddFont");
-
- // Add a new font to the font context in each worker thread.
- // Use a barrier to ensure that each worker in the pool handles
- // one of these messages, to ensure that the new font gets
- // added to each worker thread.
- let barrier = Arc::new(Barrier::new(worker_count));
- for _ in 0..worker_count {
- let barrier = Arc::clone(&barrier);
- let font_template = font_template.clone();
- workers.spawn_async(move || {
- FONT_CONTEXT.with(|font_context| {
- let mut font_context = font_context.borrow_mut();
- match font_template {
- FontTemplate::Raw(ref bytes, index) => {
- font_context.add_raw_font(&font_key, &**bytes, index);
- }
- FontTemplate::Native(ref native_font_handle) => {
- font_context.add_native_font(&font_key,
- (*native_font_handle).clone());
- }
- }
- });
-
- barrier.wait();
- });
- }
- }
- GlyphCacheMsg::DeleteFont(font_key) => {
- profile_scope!("DeleteFont");
-
- // Delete a font from the font context in each worker thread.
- let barrier = Arc::new(Barrier::new(worker_count));
- for _ in 0..worker_count {
- let barrier = Arc::clone(&barrier);
- workers.spawn_async(move || {
- FONT_CONTEXT.with(|font_context| {
- let mut font_context = font_context.borrow_mut();
- font_context.delete_font(&font_key);
- });
- barrier.wait();
- });
- }
-
- }
- GlyphCacheMsg::RequestGlyphs(key, size, color, glyph_instances, render_mode, glyph_options) => {
- profile_scope!("RequestGlyphs");
-
- // Request some glyphs for a text run.
- // For any glyph that isn't currently in the cache,
- // immeediately push a job to the worker thread pool
- // to start rasterizing this glyph now!
- let glyph_cache = glyph_cache.as_mut().unwrap();
-
- for glyph_instance in glyph_instances {
- let glyph_key = RenderedGlyphKey::new(key,
- size,
- color,
- glyph_instance.index,
- glyph_instance.point,
- render_mode,
- glyph_options);
-
- glyph_cache.mark_as_needed(&glyph_key, current_frame_id);
- if !glyph_cache.contains_key(&glyph_key) &&
- !pending_glyphs.contains(&glyph_key) {
- let glyph_tx = glyph_tx.clone();
- pending_glyphs.insert(glyph_key.clone());
- workers.spawn_async(move || {
- profile_scope!("glyph");
- FONT_CONTEXT.with(move |font_context| {
- let mut font_context = font_context.borrow_mut();
- let result = font_context.rasterize_glyph(&glyph_key.key,
- render_mode,
- glyph_options);
- if let Some(ref glyph) = result {
- assert_eq!(glyph.bytes.len(), 4 * (glyph.width * glyph.height) as usize);
- }
- glyph_tx.send((glyph_key, result)).unwrap();
- });
- });
- }
- }
- }
- GlyphCacheMsg::EndFrame => {
- profile_scope!("EndFrame");
-
- // The resource cache has finished requesting glyphs. Block
- // on completion of any pending glyph rasterizing jobs, and then
- // return the list of new glyphs to the resource cache.
- let cache = glyph_cache.take().unwrap();
- let mut rasterized_glyphs = Vec::new();
- while !pending_glyphs.is_empty() {
- let (key, glyph) = glyph_rx.recv()
- .expect("BUG: Should be glyphs pending!");
- debug_assert!(pending_glyphs.contains(&key));
- pending_glyphs.remove(&key);
- if let Some(ref v) = glyph {
- debug!("received {}x{} data len {}", v.width, v.height, v.bytes.len());
- }
- rasterized_glyphs.push(GlyphRasterJob {
- key: key,
- result: glyph,
- });
- }
- // Ensure that the glyphs are always processed in the same
- // order for a given text run (since iterating a hash set doesn't
- // guarantee order). This can show up as very small float inaccuacry
- // differences in rasterizers due to the different coordinates
- // that text runs get associated with by the texture cache allocator.
- rasterized_glyphs.sort_by(|a, b| {
- a.key.cmp(&b.key)
- });
- result_tx.send(GlyphCacheResultMsg::EndFrame(cache, rasterized_glyphs)).unwrap();
- }
- }
- }
- }).unwrap();
-
- (msg_tx, result_rx)
-}
// Compute the width and height of a tile depending on its position in the image.
pub fn compute_tile_size(descriptor: &ImageDescriptor,
base_size: TileSize,
tile: TileOffset) -> (u32, u32) {
let base_size = base_size as u32;
// Most tiles are going to have base_size as width and height,
// except for tiles around the edges that are shrunk to fit the mage data
--- a/gfx/webrender/src/tiling.rs
+++ b/gfx/webrender/src/tiling.rs
@@ -24,18 +24,17 @@ use std::{f32, i32, mem, usize};
use std::collections::HashMap;
use std::hash::BuildHasherDefault;
use texture_cache::TexturePage;
use util::{TransformedRect, TransformedRectKind};
use webrender_traits::{BuiltDisplayList, ClipAndScrollInfo, ClipId, ColorF, DeviceIntPoint};
use webrender_traits::{DeviceIntRect, DeviceIntSize, DeviceUintPoint, DeviceUintSize};
use webrender_traits::{ExternalImageType, FontRenderMode, ImageRendering, LayerPoint, LayerRect};
use webrender_traits::{LayerToWorldTransform, MixBlendMode, PipelineId, TransformStyle};
-use webrender_traits::{WorldPoint4D, WorldToLayerTransform};
-use webrender_traits::{YuvColorSpace, YuvFormat};
+use webrender_traits::{WorldToLayerTransform, YuvColorSpace, YuvFormat};
// Special sentinel value recognized by the shader. It is considered to be
// a dummy task that doesn't mask out anything.
const OPAQUE_TASK_INDEX: RenderTaskIndex = RenderTaskIndex(i32::MAX as usize);
pub type DisplayListMap = HashMap<PipelineId,
BuiltDisplayList,
--- a/gfx/webrender/src/util.rs
+++ b/gfx/webrender/src/util.rs
@@ -145,16 +145,25 @@ pub fn subtract_rect<U>(rect: &TypedRect
results.push(r);
}
}
None => {
results.push(*rect);
}
}
}
+
+pub fn get_normal(x: f32) -> Option<f32> {
+ if x.is_normal() {
+ Some(x)
+ } else {
+ None
+ }
+}
+
#[derive(Debug, Clone, Copy, Eq, PartialEq)]
#[repr(u8)]
pub enum TransformedRectKind {
AxisAligned = 0,
Complex = 1,
}
#[derive(Debug, Clone)]
@@ -229,18 +238,18 @@ impl TransformedRect {
0.0,
1.0)),
];
let (mut xs, mut ys) = ([0.0; 4], [0.0; 4]);
for (vertex, (x, y)) in vertices.iter().zip(xs.iter_mut().zip(ys.iter_mut())) {
let inv_w = 1.0 / vertex.w;
- *x = vertex.x * inv_w;
- *y = vertex.y * inv_w;
+ *x = get_normal(vertex.x * inv_w).unwrap_or(0.0);
+ *y = get_normal(vertex.y * inv_w).unwrap_or(0.0);
}
xs.sort_by(|a, b| a.partial_cmp(b).unwrap());
ys.sort_by(|a, b| a.partial_cmp(b).unwrap());
let outer_min_dp = DeviceIntPoint::new((xs[0] * device_pixel_ratio).floor() as i32,
(ys[0] * device_pixel_ratio).floor() as i32);
let outer_max_dp = DeviceIntPoint::new((xs[3] * device_pixel_ratio).ceil() as i32,
@@ -249,21 +258,21 @@ impl TransformedRect {
(ys[1] * device_pixel_ratio).ceil() as i32);
let inner_max_dp = DeviceIntPoint::new((xs[2] * device_pixel_ratio).floor() as i32,
(ys[2] * device_pixel_ratio).floor() as i32);
TransformedRect {
local_rect: *rect,
vertices: vertices,
bounding_rect: DeviceIntRect::new(outer_min_dp,
- DeviceIntSize::new(outer_max_dp.x - outer_min_dp.x,
- outer_max_dp.y - outer_min_dp.y)),
+ DeviceIntSize::new(outer_max_dp.x.saturating_sub(outer_min_dp.x),
+ outer_max_dp.y.saturating_sub(outer_min_dp.y))),
inner_rect: DeviceIntRect::new(inner_min_dp,
- DeviceIntSize::new(inner_max_dp.x - inner_min_dp.x,
- inner_max_dp.y - inner_min_dp.y)),
+ DeviceIntSize::new(inner_max_dp.x.saturating_sub(inner_min_dp.x),
+ inner_max_dp.y.saturating_sub(inner_min_dp.y))),
kind: kind,
}
/*
}
}*/
}
}
--- a/gfx/webrender_traits/Cargo.toml
+++ b/gfx/webrender_traits/Cargo.toml
@@ -1,27 +1,27 @@
[package]
name = "webrender_traits"
-version = "0.39.0"
+version = "0.40.0"
authors = ["Glenn Watson <gw@intuitionlibrary.com>"]
license = "MPL-2.0"
repository = "https://github.com/servo/webrender"
[features]
nightly = ["euclid/unstable", "serde/unstable"]
ipc = ["ipc-channel"]
webgl = ["offscreen_gl_context"]
[dependencies]
app_units = "0.4"
bincode = "1.0.0-alpha2"
byteorder = "1.0"
-euclid = "0.11"
+euclid = "0.13"
gleam = "0.4.5"
-heapsize = "0.3.6"
+heapsize = ">= 0.3.6, < 0.5"
ipc-channel = {version = "0.7.2", optional = true}
offscreen_gl_context = {version = "0.8", features = ["serde"], optional = true}
serde = "0.9"
serde_derive = "0.9"
time = "0.1"
[target.'cfg(target_os = "macos")'.dependencies]
core-foundation = "0.3"
--- a/gfx/webrender_traits/src/display_item.rs
+++ b/gfx/webrender_traits/src/display_item.rs
@@ -345,16 +345,17 @@ pub enum ImageRendering {
CrispEdges = 1,
Pixelated = 2,
}
#[derive(Clone, Copy, Debug, Deserialize, PartialEq, Serialize)]
pub struct YuvImageDisplayItem {
pub yuv_data: YuvData,
pub color_space: YuvColorSpace,
+ pub image_rendering: ImageRendering
}
#[repr(u32)]
#[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
pub enum YuvColorSpace {
Rec601 = 0,
Rec709 = 1,
}
@@ -422,17 +423,17 @@ pub struct ImageMask {
#[derive(Clone, Copy, Debug, Deserialize, PartialEq, Serialize)]
pub struct ClipRegion {
pub main: LayoutRect,
pub image_mask: Option<ImageMask>,
#[serde(default, skip_serializing, skip_deserializing)]
pub complex_clips: ItemRange<ComplexClipRegion>,
#[serde(default, skip_serializing, skip_deserializing)]
pub complex_clip_count: usize,
-}
+}
#[derive(Clone, Copy, Debug, Deserialize, PartialEq, Serialize)]
pub struct ComplexClipRegion {
/// The boundaries of the rectangle.
pub rect: LayoutRect,
/// Border radii of this rectangle.
pub radii: BorderRadius,
}
--- a/gfx/webrender_traits/src/display_list.rs
+++ b/gfx/webrender_traits/src/display_list.rs
@@ -530,20 +530,22 @@ impl DisplayListBuilder {
self.push_item(item, rect);
}
/// Push a yuv image. All planar data in yuv image should use the same buffer type.
pub fn push_yuv_image(&mut self,
rect: LayoutRect,
_token: ClipRegionToken,
yuv_data: YuvData,
- color_space: YuvColorSpace) {
+ color_space: YuvColorSpace,
+ image_rendering: ImageRendering) {
let item = SpecificDisplayItem::YuvImage(YuvImageDisplayItem {
yuv_data: yuv_data,
color_space: color_space,
+ image_rendering: image_rendering,
});
self.push_item(item, rect);
}
pub fn push_webgl_canvas(&mut self,
rect: LayoutRect,
_token: ClipRegionToken,
context_id: WebGLContextId) {