aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom
diff options
context:
space:
mode:
authorEmilio Cobos Álvarez <emilio@crisal.io>2019-06-23 13:13:21 +0200
committerEmilio Cobos Álvarez <emilio@crisal.io>2019-06-25 13:11:32 +0200
commitadd08518cdaf9f75bf4d9bc2d81347824c00b154 (patch)
tree5a26cc35d6d20cbff1fcf7881752bc6d79f53771 /components/script/dom
parented2e9ce4826aa1d1d18e406e673ce4ce3fa44c51 (diff)
downloadservo-add08518cdaf9f75bf4d9bc2d81347824c00b154.tar.gz
servo-add08518cdaf9f75bf4d9bc2d81347824c00b154.zip
Fix style system build with recent changes.
Diffstat (limited to 'components/script/dom')
-rw-r--r--components/script/dom/element.rs5
-rw-r--r--components/script/dom/webidls/CSSStyleDeclaration.webidl7
2 files changed, 9 insertions, 3 deletions
diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs
index 764c7ce6051..5695e355368 100644
--- a/components/script/dom/element.rs
+++ b/components/script/dom/element.rs
@@ -132,8 +132,7 @@ use style::selector_parser::{
use style::shared_lock::{Locked, SharedRwLock};
use style::thread_state;
use style::values::generics::NonNegative;
-use style::values::{computed, specified};
-use style::values::{CSSFloat, Either};
+use style::values::{computed, specified, CSSFloat};
use style::CaseSensitivityExt;
use xml5ever::serialize as xmlSerialize;
use xml5ever::serialize::SerializeOpts as XmlSerializeOpts;
@@ -684,7 +683,7 @@ impl LayoutElementHelpers for LayoutDom<Element> {
hints.push(from_declaration(
shared_lock,
PropertyDeclaration::BackgroundImage(background_image::SpecifiedValue(
- vec![Either::Second(specified::Image::for_cascade(url.into()))].into(),
+ vec![specified::ImageLayer::Image(specified::Image::for_cascade(url.into()))].into(),
)),
));
}
diff --git a/components/script/dom/webidls/CSSStyleDeclaration.webidl b/components/script/dom/webidls/CSSStyleDeclaration.webidl
index d64de8f3e5a..a49d3ec465a 100644
--- a/components/script/dom/webidls/CSSStyleDeclaration.webidl
+++ b/components/script/dom/webidls/CSSStyleDeclaration.webidl
@@ -237,10 +237,17 @@ partial interface CSSStyleDeclaration {
[CEReactions, SetterThrows] attribute [TreatNullAs=EmptyString] DOMString counter-reset;
[CEReactions, SetterThrows] attribute [TreatNullAs=EmptyString] DOMString overflow;
+
+ [CEReactions, SetterThrows] attribute [TreatNullAs=EmptyString] DOMString overflowBlock;
+ [CEReactions, SetterThrows] attribute [TreatNullAs=EmptyString] DOMString overflow-block;
+ [CEReactions, SetterThrows] attribute [TreatNullAs=EmptyString] DOMString overflowInline;
+ [CEReactions, SetterThrows] attribute [TreatNullAs=EmptyString] DOMString overflow-inline;
+
[CEReactions, SetterThrows] attribute [TreatNullAs=EmptyString] DOMString overflowX;
[CEReactions, SetterThrows] attribute [TreatNullAs=EmptyString] DOMString overflow-x;
[CEReactions, SetterThrows] attribute [TreatNullAs=EmptyString] DOMString overflowY;
[CEReactions, SetterThrows] attribute [TreatNullAs=EmptyString] DOMString overflow-y;
+
[CEReactions, SetterThrows] attribute [TreatNullAs=EmptyString] DOMString overflowWrap;
[CEReactions, SetterThrows] attribute [TreatNullAs=EmptyString] DOMString overflow-wrap;