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

Solving merge conficts related to the html5ever_atoms -> html5ever change

Browse source
This commit is contained in:
Christian Poveda 2017-05-03 12:57:49 -05:00
commit 62821a6915
188 changed files with 1130 additions and 697 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/script/dom/htmlcanvaselement.rs
View file

@ -27,7 +27,7 @@ use dom::virtualmethods::VirtualMethods;
use dom::webglrenderingcontext::{LayoutCanvasWebGLRenderingContextHelpers, WebGLRenderingContext};
use dom_struct::dom_struct;
use euclid::size::Size2D;
use html5ever_atoms::{LocalName, Prefix};
use html5ever::{LocalName, Prefix};
use image::ColorType;
use image::png::PNGEncoder;
use ipc_channel::ipc::{self, IpcSender};