Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 23:03:42 +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

4
components/script/dom/htmlobjectelement.rs
View file

@ -18,10 +18,10 @@ use dom::validation::Validatable;
use dom::validitystate::{ValidityState, ValidationFlags};
use dom::virtualmethods::VirtualMethods;
use dom_struct::dom_struct;
use html5ever_atoms::{LocalName, Prefix};
use html5ever::{LocalName, Prefix};
use net_traits::image::base::Image;
use std::default::Default;
use std::sync::Arc;
use style::stylearc::Arc;
#[dom_struct]
pub struct HTMLObjectElement {