Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Have BufferMap store NativeSurfaces and rename to SurfaceMap

Browse source 
We currently store LayerBuffers, because previously NativeSurfaces did
not record their own size. Now we can store NativeSurfaces directly,
which saves a bit of space in the surface cache and allows us to create
LayerBuffers only in the PaintTask.

This also means that instead of sending cached LayerBuffers, the
compositor can just send cached NativeSurfaces to the PaintTask.
This commit is contained in:
Martin Robinson 2015-07-17 14:17:40 -07:00
parent cdcecaef04
commit 1aedead955
10 changed files with 221 additions and 217 deletions
Download patch file Download diff file Expand all files Collapse all files

37
components/gfx/paint_task.rs
View file

@ -17,7 +17,6 @@ use euclid::rect::Rect;
use euclid::size::Size2D;
use layers::platform::surface::{NativeDisplay, NativeSurface};
use layers::layers::{BufferRequest, LayerBuffer, LayerBufferSet};
use layers;
use canvas_traits::CanvasMsg;
use msg::compositor_msg::{Epoch, FrameTreeId, LayerId, LayerKind};
use msg::compositor_msg::{LayerProperties, PaintListener, ScrollPolicy};
@ -508,7 +507,7 @@ impl WorkerThread {
DrawTarget::new(BackendType::Skia, size, SurfaceFormat::B8G8R8A8)
} else {
let gl_rasterization_context =
layer_buffer.native_surface.gl_rasterization_context(native_display!(self), size);
layer_buffer.native_surface.gl_rasterization_context(native_display!(self));
match gl_rasterization_context {
Some(gl_rasterization_context) => {
gl_rasterization_context.make_current();
@ -609,25 +608,23 @@ impl WorkerThread {
tile: &mut BufferRequest,
scale: f32)
-> Box<LayerBuffer> {
tile.layer_buffer.take().unwrap_or_else(|| {
// Create an empty native surface. We mark it as not leaking
// in case it dies in transit to the compositor task.
let width = tile.screen_rect.size.width;
let height = tile.screen_rect.size.height;
let mut native_surface: NativeSurface =
layers::platform::surface::NativeSurface::new(native_display!(self),
Size2D::new(width as i32, height as i32));
native_surface.mark_wont_leak();
// Create an empty native surface. We mark it as not leaking
// in case it dies in transit to the compositor task.
let width = tile.screen_rect.size.width;
let height = tile.screen_rect.size.height;
let mut native_surface = tile.native_surface.take().unwrap_or_else(|| {
NativeSurface::new(native_display!(self), Size2D::new(width as i32, height as i32))
});
native_surface.mark_wont_leak();
box LayerBuffer {
native_surface: native_surface,
rect: tile.page_rect,
screen_pos: tile.screen_rect,
resolution: scale,
painted_with_cpu: !opts::get().gpu_painting,
content_age: tile.content_age,
}
})
box LayerBuffer {
native_surface: native_surface,
rect: tile.page_rect,
screen_pos: tile.screen_rect,
resolution: scale,
painted_with_cpu: !opts::get().gpu_painting,
content_age: tile.content_age,
}
}
}