Update some canvas properties as enums instead of DOMString

[saurvs]

Fixes #9617

I'm going to incrementally rollout commits and squash them finally.

[highfive]

Warning

• These commits modify script code, but no tests are modified. Please consider adding a test!

[saurvs]

@jdm In components/script/dom/canvasrenderingcontext2d.rs, the functions LineCap(&self) and SetLineCap(&self, cap_str: DOMString) return and accept a DOMString. Should I modify them to return and accept an appropriate enum instead?

[Ms2ger]

Yep; I don't expect your build to succeed without that change.

[saurvs]

@Ms2ger Does this change make sense?

[jdm]

@saurvs There are still build errors, so there's some more work to do. Are you building locally?

[nox]

components/script/dom/canvasrenderingcontext2d.rs:1212:5: 1214:6 error: method `LineCap` has an incompatible type for trait:
 expected enum `dom::bindings::codegen::Bindings::CanvasRenderingContext2DBinding::CanvasLineCap`,
    found enum `canvas_traits::LineCapStyle` [E0053]
components/script/dom/canvasrenderingcontext2d.rs:1212     fn LineCap(&self) -> LineCapStyle {
components/script/dom/canvasrenderingcontext2d.rs:1213         self.state.borrow().line_cap
components/script/dom/canvasrenderingcontext2d.rs:1214     }
components/script/dom/canvasrenderingcontext2d.rs:1212:5: 1214:6 help: run `rustc --explain E0053` to see a detailed explanation
components/script/dom/canvasrenderingcontext2d.rs:1217:5: 1220:6 error: method `SetLineCap` has an incompatible type for trait:
 expected enum `dom::bindings::codegen::Bindings::CanvasRenderingContext2DBinding::CanvasLineCap`,
    found enum `canvas_traits::LineCapStyle` [E0053]
components/script/dom/canvasrenderingcontext2d.rs:1217     fn SetLineCap(&self, cap: LineCapStyle) {
components/script/dom/canvasrenderingcontext2d.rs:1218         self.state.borrow_mut().line_cap = cap;
components/script/dom/canvasrenderingcontext2d.rs:1219         self.ipc_renderer.send(CanvasMsg::Canvas2d(Canvas2dMsg::SetLineCap(cap))).unwrap();
components/script/dom/canvasrenderingcontext2d.rs:1220     }
components/script/dom/canvasrenderingcontext2d.rs:1217:5: 1220:6 help: run `rustc --explain E0053` to see a detailed explanation
components/script/dom/canvasrenderingcontext2d.rs:1223:5: 1225:6 error: method `LineJoin` has an incompatible type for trait:
 expected enum `dom::bindings::codegen::Bindings::CanvasRenderingContext2DBinding::CanvasLineJoin`,
    found enum `canvas_traits::LineJoinStyle` [E0053]
components/script/dom/canvasrenderingcontext2d.rs:1223     fn LineJoin(&self) -> LineJoinStyle {
components/script/dom/canvasrenderingcontext2d.rs:1224         self.state.borrow().line_join
components/script/dom/canvasrenderingcontext2d.rs:1225     }
components/script/dom/canvasrenderingcontext2d.rs:1223:5: 1225:6 help: run `rustc --explain E0053` to see a detailed explanation
components/script/dom/canvasrenderingcontext2d.rs:1228:5: 1231:6 error: method `SetLineJoin` has an incompatible type for trait:
 expected enum `dom::bindings::codegen::Bindings::CanvasRenderingContext2DBinding::CanvasLineJoin`,
    found enum `canvas_traits::LineJoinStyle` [E0053]
components/script/dom/canvasrenderingcontext2d.rs:1228     fn SetLineJoin(&self, join: LineJoinStyle) {
components/script/dom/canvasrenderingcontext2d.rs:1229         self.state.borrow_mut().line_join = join;
components/script/dom/canvasrenderingcontext2d.rs:1230         self.ipc_renderer.send(CanvasMsg::Canvas2d(Canvas2dMsg::SetLineJoin(join))).unwrap();
components/script/dom/canvasrenderingcontext2d.rs:1231     }
components/script/dom/canvasrenderingcontext2d.rs:1228:5: 1231:6 help: run `rustc --explain E0053` to see a detailed explanation
error: aborting due to 4 previous errors

[saurvs]

@jdm The build works now.

[KiChjang]

Undo this change please.

[jdm]

@saurvs Thanks! This looks great; I can't think of any way to avoid the conversion between the two enum values, since script has to depend on canvas_msg. Once you add back the newline, I'll merge this!

[nox]

@bors-servo r=jdm

[bors-servo]

📌 Commit 939560b has been approved by jdm

[bors-servo]

⌛ Testing commit 939560b with merge 1ec62c8...

[bors-servo]

💔 Test failed - mac-rel-css

[jdm]

@bors-servo: retry

• #7791

[bors-servo]

⌛ Testing commit 939560b with merge c68fbee...

[bors-servo]

☀️ Test successful - android, gonk, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt