Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-02 14:30:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

servo: Merge #15915 - stylo: Make URLs work in inline style (from Manishearth:stylo-style-attr); r=emilio

Browse Source 
r=emilio

https://bugzilla.mozilla.org/show_bug.cgi?id=1341690

Source-Repo: https://github.com/servo/servo
Source-Revision: c9310ab144506e152131faecfa79d109822e9a8d

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 0bc2ff168321b96e5c203979bf407f867572cd8c
This commit is contained in:
Manish Goregaokar 2017-03-11 12:08:49 -08:00
parent ffe7d25e12
commit 7aa55b12c5
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
servo/components/style/gecko/wrapper.rs
View File

@ -296,13 +296,10 @@ impl<'le> fmt::Debug for GeckoElement<'le> {
impl<'le> GeckoElement<'le> {
/// Parse the style attribute of an element.
pub fn parse_style_attribute(value: &str) -> PropertyDeclarationBlock {
// FIXME(bholley): Real base URL and error reporter.
let base_url = &*DUMMY_BASE_URL;
// FIXME(heycam): Needs real ParserContextExtraData so that URLs parse
// properly.
let extra_data = ParserContextExtraData::default();
parse_style_attribute(value, &base_url, Box::new(StdoutErrorReporter), extra_data)
pub fn parse_style_attribute(value: &str,
base_url: &ServoUrl,
extra_data: ParserContextExtraData) -> PropertyDeclarationBlock {
parse_style_attribute(value, base_url, Box::new(StdoutErrorReporter), extra_data)
}
fn flags(&self) -> u32 {

4
servo/components/style/gecko_bindings/bindings.rs
View File

@ -1415,7 +1415,9 @@ extern "C" {
-> bool;
}
extern "C" {
pub fn Servo_ParseStyleAttribute(data: *const nsACString_internal)
pub fn Servo_ParseStyleAttribute(data: *const nsACString_internal,
base: *const nsACString_internal,
extraData: *const GeckoParserExtraData)
-> RawServoDeclarationBlockStrong;
}
extern "C" {

8
servo/ports/geckolib/glue.rs
View File

@ -718,9 +718,13 @@ pub extern "C" fn Servo_ParseProperty(property: *const nsACString, value: *const
}
#[no_mangle]
pub extern "C" fn Servo_ParseStyleAttribute(data: *const nsACString) -> RawServoDeclarationBlockStrong {
pub extern "C" fn Servo_ParseStyleAttribute(data: *const nsACString,
base: *const nsACString,
raw_extra_data: *const structs::GeckoParserExtraData)
-> RawServoDeclarationBlockStrong {
let value = unsafe { data.as_ref().unwrap().as_str_unchecked() };
Arc::new(RwLock::new(GeckoElement::parse_style_attribute(value))).into_strong()
make_context!((base, raw_extra_data) => (base_url, extra_data));
Arc::new(RwLock::new(GeckoElement::parse_style_attribute(value, &base_url, extra_data))).into_strong()
}
#[no_mangle]