Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

script: Fix base url for style-rule-owned declarations.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2017-01-27 19:39:00 +01:00
parent dd90366775
commit 9b06932535
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
3 changed files with 24 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/script/dom/csskeyframerule.rs
View file

@ -3,6 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use dom::bindings::codegen::Bindings::CSSKeyframeRuleBinding::{self, CSSKeyframeRuleMethods}; use dom::bindings::codegen::Bindings::CSSKeyframeRuleBinding::{self, CSSKeyframeRuleMethods};
use dom::bindings::inheritance::Castable;
use dom::bindings::js::{JS, MutNullableJS, Root}; use dom::bindings::js::{JS, MutNullableJS, Root};
use dom::bindings::reflector::{DomObject, reflect_dom_object}; use dom::bindings::reflector::{DomObject, reflect_dom_object};
use dom::bindings::str::DOMString; use dom::bindings::str::DOMString;
@ -47,8 +48,8 @@ impl CSSKeyframeRuleMethods for CSSKeyframeRule {
fn Style(&self) -> Root<CSSStyleDeclaration> { fn Style(&self) -> Root<CSSStyleDeclaration> {
self.style_decl.or_init(|| { self.style_decl.or_init(|| {
CSSStyleDeclaration::new(self.global().as_window(), CSSStyleDeclaration::new(self.global().as_window(),
CSSStyleOwner::CSSRule(JS::from_ref(self.global().as_window()), CSSStyleOwner::CSSRule(JS::from_ref(self.upcast()),
self.keyframerule.read().block.clone()), self.keyframerule.read().block.clone()),
None, None,
CSSModificationAccess::ReadWrite) CSSModificationAccess::ReadWrite)
}) })

25
components/script/dom/cssstyledeclaration.rs
View file

@ -7,12 +7,14 @@ use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods;
use dom::bindings::error::{Error, ErrorResult, Fallible}; use dom::bindings::error::{Error, ErrorResult, Fallible};
use dom::bindings::inheritance::Castable; use dom::bindings::inheritance::Castable;
use dom::bindings::js::{JS, Root}; use dom::bindings::js::{JS, Root};
use dom::bindings::reflector::{Reflector, reflect_dom_object}; use dom::bindings::reflector::{DomObject, Reflector, reflect_dom_object};
use dom::bindings::str::DOMString; use dom::bindings::str::DOMString;
use dom::cssrule::CSSRule;
use dom::element::Element; use dom::element::Element;
use dom::node::{Node, NodeDamage, window_from_node}; use dom::node::{Node, NodeDamage, window_from_node};
use dom::window::Window; use dom::window::Window;
use parking_lot::RwLock; use parking_lot::RwLock;
use servo_url::ServoUrl;
use std::ascii::AsciiExt; use std::ascii::AsciiExt;
use std::sync::Arc; use std::sync::Arc;
use style::parser::ParserContextExtraData; use style::parser::ParserContextExtraData;
@ -34,7 +36,7 @@ pub struct CSSStyleDeclaration {
#[must_root] #[must_root]
pub enum CSSStyleOwner { pub enum CSSStyleOwner {
Element(JS<Element>), Element(JS<Element>),
CSSRule(JS<Window>, CSSRule(JS<CSSRule>,
#[ignore_heap_size_of = "Arc"] #[ignore_heap_size_of = "Arc"]
Arc<RwLock<PropertyDeclarationBlock>>), Arc<RwLock<PropertyDeclarationBlock>>),
} }
@ -84,10 +86,10 @@ impl CSSStyleOwner {
} }
result result
} }
CSSStyleOwner::CSSRule(ref win, ref pdb) => { CSSStyleOwner::CSSRule(ref rule, ref pdb) => {
let result = f(&mut *pdb.write(), &mut changed); let result = f(&mut *pdb.write(), &mut changed);
if changed { if changed {
win.Document().invalidate_stylesheets(); rule.global().as_window().Document().invalidate_stylesheets();
} }
result result
} }
@ -119,7 +121,16 @@ impl CSSStyleOwner {
fn window(&self) -> Root<Window> { fn window(&self) -> Root<Window> {
match *self { match *self {
CSSStyleOwner::Element(ref el) => window_from_node(&**el), CSSStyleOwner::Element(ref el) => window_from_node(&**el),
CSSStyleOwner::CSSRule(ref window, _) => Root::from_ref(&**window), CSSStyleOwner::CSSRule(ref rule, _) => Root::from_ref(rule.global().as_window()),
}
}
fn base_url(&self) -> ServoUrl {
match *self {
CSSStyleOwner::Element(ref el) => window_from_node(&**el).get_url(),
CSSStyleOwner::CSSRule(ref rule, _) => {
rule.parent_stylesheet().style_stylesheet().base_url.clone()
}
} }
} }
} }
@ -228,7 +239,7 @@ impl CSSStyleDeclaration {
// Step 6 // Step 6
let window = self.owner.window(); let window = self.owner.window();
let declarations = let declarations =
parse_one_declaration(id, &value, &window.get_url(), parse_one_declaration(id, &value, &self.owner.base_url(),
window.css_error_reporter(), window.css_error_reporter(),
ParserContextExtraData::default()); ParserContextExtraData::default());
@ -414,7 +425,7 @@ impl CSSStyleDeclarationMethods for CSSStyleDeclaration {
self.owner.mutate_associated_block(|mut pdb, mut _changed| { self.owner.mutate_associated_block(|mut pdb, mut _changed| {
// Step 3 // Step 3
*pdb = parse_style_attribute(&value, *pdb = parse_style_attribute(&value,
&window.get_url(), &self.owner.base_url(),
window.css_error_reporter(), window.css_error_reporter(),
ParserContextExtraData::default()); ParserContextExtraData::default());
}); });

5
components/script/dom/cssstylerule.rs
View file

@ -3,6 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use dom::bindings::codegen::Bindings::CSSStyleRuleBinding::{self, CSSStyleRuleMethods}; use dom::bindings::codegen::Bindings::CSSStyleRuleBinding::{self, CSSStyleRuleMethods};
use dom::bindings::inheritance::Castable;
use dom::bindings::js::{JS, MutNullableJS, Root}; use dom::bindings::js::{JS, MutNullableJS, Root};
use dom::bindings::reflector::{DomObject, reflect_dom_object}; use dom::bindings::reflector::{DomObject, reflect_dom_object};
use dom::bindings::str::DOMString; use dom::bindings::str::DOMString;
@ -58,8 +59,8 @@ impl CSSStyleRuleMethods for CSSStyleRule {
fn Style(&self) -> Root<CSSStyleDeclaration> { fn Style(&self) -> Root<CSSStyleDeclaration> {
self.style_decl.or_init(|| { self.style_decl.or_init(|| {
CSSStyleDeclaration::new(self.global().as_window(), CSSStyleDeclaration::new(self.global().as_window(),
CSSStyleOwner::CSSRule(JS::from_ref(self.global().as_window()), CSSStyleOwner::CSSRule(JS::from_ref(self.upcast()),
self.stylerule.read().block.clone()), self.stylerule.read().block.clone()),
None, None,
CSSModificationAccess::ReadWrite) CSSModificationAccess::ReadWrite)
}) })