Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 21:20:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Clean up dirty rect computation

Browse source
This commit is contained in:
David Zbarsky 2015-08-08 05:00:37 -04:00
parent 7bcb911cea
commit 9a88348978
1 changed files with 13 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

31
components/canvas/canvas_paint_task.rs
View file

@ -556,46 +556,41 @@ impl<'a> CanvasPaintTask<'a> {
// rgba -> bgra // rgba -> bgra
byte_swap(&mut imagedata); byte_swap(&mut imagedata);
// 1) If dirtyWidth is negative, let image_data_size = image_data_rect.size;
// let dirtyX be dirtyX+dirtyWidth,
// and let dirtyWidth be equal to the absolute magnitude of dirtyWidth. // Step 1. TODO (neutered data)
// Step 2.
if dirty_rect.size.width < 0.0f64 { if dirty_rect.size.width < 0.0f64 {
dirty_rect.origin.x = dirty_rect.origin.x + dirty_rect.size.width; dirty_rect.origin.x += dirty_rect.size.width;
dirty_rect.size.width = -dirty_rect.size.width; dirty_rect.size.width = -dirty_rect.size.width;
} }
// 2) If dirtyHeight is negative, let dirtyY be dirtyY+dirtyHeight,
// and let dirtyHeight be equal to the absolute magnitude of dirtyHeight.
if dirty_rect.size.height < 0.0f64 { if dirty_rect.size.height < 0.0f64 {
dirty_rect.origin.y = dirty_rect.origin.y + dirty_rect.size.height; dirty_rect.origin.y += dirty_rect.size.height;
dirty_rect.size.height = -dirty_rect.size.height; dirty_rect.size.height = -dirty_rect.size.height;
} }
// 3) If dirtyX is negative, let dirtyWidth be dirtyWidth+dirtyX, and let dirtyX be zero. // Step 3.
if dirty_rect.origin.x < 0.0f64 { if dirty_rect.origin.x < 0.0f64 {
dirty_rect.size.width += dirty_rect.origin.x; dirty_rect.size.width += dirty_rect.origin.x;
dirty_rect.origin.x = 0.0f64; dirty_rect.origin.x = 0.0f64;
} }
// 3) If dirtyY is negative, let dirtyHeight be dirtyHeight+dirtyY, and let dirtyY be zero.
if dirty_rect.origin.y < 0.0f64 { if dirty_rect.origin.y < 0.0f64 {
dirty_rect.size.height += dirty_rect.origin.y; dirty_rect.size.height += dirty_rect.origin.y;
dirty_rect.origin.y = 0.0f64; dirty_rect.origin.y = 0.0f64;
} }
// 4) If dirtyX+dirtyWidth is greater than the width attribute of the imagedata argument, // Step 4.
// let dirtyWidth be the value of that width attribute, minus the value of dirtyX. if dirty_rect.max_x() > image_data_size.width {
if dirty_rect.origin.x + dirty_rect.size.width > image_data_rect.size.width { dirty_rect.size.width = image_data_size.width - dirty_rect.origin.x;
dirty_rect.size.width = image_data_rect.size.width - dirty_rect.origin.x;
} }
// 4) If dirtyY+dirtyHeight is greater than the height attribute of the imagedata argument, if dirty_rect.max_y() > image_data_size.height {
// let dirtyHeight be the value of that height attribute, minus the value of dirtyY. dirty_rect.size.height = image_data_size.height - dirty_rect.origin.y;
if dirty_rect.origin.y + dirty_rect.size.height > image_data_rect.size.height {
dirty_rect.size.height = image_data_rect.size.height - dirty_rect.origin.y;
} }
// 5) If either dirtyWidth or dirtyHeight is negative or zero, // 5) If either dirtyWidth or dirtyHeight is negative or zero,
// stop without affecting any bitmaps // stop without affecting any bitmaps
if dirty_rect.size.width <= 0.0 || dirty_rect.size.height <= 0.0 { if dirty_rect.size.width <= 0.0 || dirty_rect.size.height <= 0.0 {