diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-10-14 05:27:51 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-14 05:27:51 -0500 |
commit | 2be76c5fd7b74f334f8ce975e2051c77762314c2 (patch) | |
tree | c5bcaa469704296a2c9a7e86dbafaf21f891cc6b /components/script | |
parent | 8b366a7441a7a4febcb5e2047807f9ad447c7adb (diff) | |
parent | 6d694a4bcd97e8602e39c576452604796c17d269 (diff) | |
download | servo-2be76c5fd7b74f334f8ce975e2051c77762314c2.tar.gz servo-2be76c5fd7b74f334f8ce975e2051c77762314c2.zip |
Auto merge of #18867 - emilio:parse-hack, r=heycam
style: Dishonor display: -moz-box if -webkit-box was specified before
This is a compatibility hack that Gecko supports that is apparently important for android.
I want to remove it, but let's see...
See https://bugzilla.mozilla.org/show_bug.cgi?id=1407701 for reference.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18867)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script')
-rw-r--r-- | components/script/dom/cssstyledeclaration.rs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/components/script/dom/cssstyledeclaration.rs b/components/script/dom/cssstyledeclaration.rs index f2cb3b4e5ce..71220f6e87b 100644 --- a/components/script/dom/cssstyledeclaration.rs +++ b/components/script/dom/cssstyledeclaration.rs @@ -18,7 +18,7 @@ use servo_arc::Arc; use servo_url::ServoUrl; use std::ascii::AsciiExt; use style::attr::AttrValue; -use style::properties::{Importance, PropertyDeclarationBlock, PropertyId, LonghandId, ShorthandId}; +use style::properties::{DeclarationSource, Importance, PropertyDeclarationBlock, PropertyId, LonghandId, ShorthandId}; use style::properties::{parse_one_declaration_into, parse_style_attribute, SourcePropertyDeclaration}; use style::selector_parser::PseudoElement; use style::shared_lock::Locked; @@ -274,7 +274,11 @@ impl CSSStyleDeclaration { // Step 7 // Step 8 - *changed = pdb.extend_reset(declarations.drain(), importance); + *changed = pdb.extend( + declarations.drain(), + importance, + DeclarationSource::CssOm, + ); Ok(()) }) |