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

Auto merge of #6239 - hyowon:drawimage_rects, r=jdm

Browse source 
https://html.spec.whatwg.org/multipage/#dom-context-2d-drawimage
The source and destination rectangles have four points (x, y), (x+w, y), (x+w, y+h), (x, y+h), which doesn't mean rect(x, y, w, h).
cc @yichoi

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6239)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-06-01 07:36:42 -05:00
commit 2a8d595289
4 changed files with 4 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/script/dom/canvasrenderingcontext2d.rs
View file

@ -140,8 +140,8 @@ impl CanvasRenderingContext2D {
// The source rectangle is the rectangle whose corners are the four points (sx, sy),
// (sx+sw, sy), (sx+sw, sy+sh), (sx, sy+sh).
let source_rect = Rect(Point2D(sx, sy),
Size2D(sw, sh));
let source_rect = Rect(Point2D(sx.min(sx+sw), sy.min(sy+sh)),
Size2D(sw.abs(), sh.abs()));
// When the source rectangle is outside the source image,
// the source rectangle must be clipped to the source image
@ -158,8 +158,8 @@ impl CanvasRenderingContext2D {
// The destination rectangle is the rectangle whose corners are the four points (dx, dy),
// (dx+dw, dy), (dx+dw, dy+dh), (dx, dy+dh).
let dest_rect = Rect(Point2D(dx, dy),
Size2D(dest_rect_width_scaled, dest_rect_height_scaled));
let dest_rect = Rect(Point2D(dx.min(dx+dest_rect_width_scaled), dy.min(dy+dest_rect_height_scaled)),
Size2D(dest_rect_width_scaled.abs(), dest_rect_height_scaled.abs()));
let source_rect = Rect(Point2D(source_rect_clipped.origin.x,
source_rect_clipped.origin.y),

5
tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/2d.drawImage.negativedest.html.ini
View file

@ -1,5 +0,0 @@
[2d.drawImage.negativedest.html]
type: testharness
[Negative destination width/height represents the correct rectangle]
expected: FAIL

5
tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/2d.drawImage.negativedir.html.ini
View file

@ -1,5 +0,0 @@
[2d.drawImage.negativedir.html]
type: testharness
[Negative dimensions do not affect the direction of the image]
expected: FAIL

5
tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/2d.drawImage.negativesource.html.ini
View file

@ -1,5 +0,0 @@
[2d.drawImage.negativesource.html]
type: testharness
[Negative source width/height represents the correct rectangle]
expected: FAIL