Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Implement CanvasRenderingContext2d.fillText's "unimplemented" message

Browse source
This commit is contained in:
Bruno Bernardino 2017-08-09 12:34:12 +01:00
parent 1c9c0334ba
commit 2af828485f
No known key found for this signature in database
GPG key ID: C8019746F44687CD
6 changed files with 35 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/canvas/canvas_paint_thread.rs
View file

@ -133,6 +133,7 @@ impl<'a> CanvasPaintThread<'a> {
match msg.unwrap() {
CanvasMsg::Canvas2d(message) => {
match message {
Canvas2dMsg::FillText(text, x, y, max_width) => painter.fill_text(text, x, y, max_width),
Canvas2dMsg::FillRect(ref rect) => painter.fill_rect(rect),
Canvas2dMsg::StrokeRect(ref rect) => painter.stroke_rect(rect),
Canvas2dMsg::ClearRect(ref rect) => painter.clear_rect(rect),
@ -228,6 +229,10 @@ impl<'a> CanvasPaintThread<'a> {
}
}
fn fill_text(&self, text: String, x: f64, y: f64, max_width: Option<f64>) {
error!("Unimplemented canvas2d.fillText. Values received: {}, {}, {}, {:?}.", text, x, y, max_width);
}
fn fill_rect(&self, rect: &Rect<f32>) {
if is_zero_size_gradient(&self.state.fill_style) {
return; // Paint nothing if gradient size is zero.

1
components/canvas_traits/canvas.rs
View file

@ -43,6 +43,7 @@ pub enum Canvas2dMsg {
Clip,
ClosePath,
Fill,
FillText(String, f64, f64, Option<f64>),
FillRect(Rect<f32>),
GetImageData(Rect<i32>, Size2D<f64>, IpcSender<Vec<u8>>),
IsPointInPath(f64, f64, FillRule, IpcSender<bool>),

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

@ -800,6 +800,13 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
receiver.recv().unwrap()
}
// https://html.spec.whatwg.org/multipage/#dom-context-2d-filltext
fn FillText(&self, text: DOMString, x: f64, y: f64, max_width: Option<f64>) {
let parsed_text: String = text.into();
self.ipc_renderer.send(CanvasMsg::Canvas2d(Canvas2dMsg::FillText(parsed_text, x, y, max_width))).unwrap();
self.mark_as_dirty();
}
// https://html.spec.whatwg.org/multipage/#dom-context-2d-drawimage
fn DrawImage(&self,
image: CanvasImageSource,

6
components/script/dom/webidls/CanvasRenderingContext2D.webidl
View file

@ -153,8 +153,9 @@ interface CanvasUserInterface {
[NoInterfaceObject]
interface CanvasText {
// text (see also the CanvasDrawingStyles interface)
//void fillText(DOMString text, unrestricted double x, unrestricted double y,
// optional unrestricted double maxWidth);
[Pref="dom.canvas-text.enabled"]
void fillText(DOMString text, unrestricted double x, unrestricted double y,
optional unrestricted double maxWidth);
//void strokeText(DOMString text, unrestricted double x, unrestricted double y,
// optional unrestricted double maxWidth);
//TextMetrics measureText(DOMString text);
@ -264,4 +265,3 @@ interface CanvasPath {
// double rotation, double startAngle, double endAngle,
// boolean anticlockwise);
};

1
resources/prefs.json
View file

@ -1,6 +1,7 @@
{
"dom.bluetooth.enabled": false,
"dom.bluetooth.testing.enabled": false,
"dom.canvas-text.enabled": false,
"dom.compositionevent.enabled": false,
"dom.customelements.enabled": false,
"dom.forcetouch.enabled": false,

18
tests/html/test_canvas_filltext.html Normal file
View file

@ -0,0 +1,18 @@
<!DOCTYPE html>
<html>
<body>
<canvas id="tutorial" style="border:1px solid #d3d3d3"></canvas>
<script type="text/javascript">
canvas = document.getElementById('tutorial');
canvas.width = 200;
canvas.height = 200;
var ctx = canvas.getContext('2d');
ctx.fillText('Test', 10.0, 10.0);
ctx.fillText('Test truncated', 30.0, 20.0, 5.0);
</script>
</body>
</html>