From 3b55a5fca09d6dc8475b4a84f75f27c3f362f21b Mon Sep 17 00:00:00 2001
From: Youngmin Yoo <youngmin.yoo@samsung.com>
Date: Wed, 5 Feb 2014 11:24:08 +0900
Subject: [PATCH 1/5] Add background-image property

---
 src/components/style/properties.rs.mako | 53 ++++++++++++++++++++++---
 1 file changed, 47 insertions(+), 6 deletions(-)

diff --git a/src/components/style/properties.rs.mako b/src/components/style/properties.rs.mako
index be73277dd3d..e8325110d1d 100644
--- a/src/components/style/properties.rs.mako
+++ b/src/components/style/properties.rs.mako
@@ -5,8 +5,10 @@
 // This file is a Mako template: http://www.makotemplates.org/
 
 use std::ascii::StrAsciiExt;
+pub use servo_util::url::parse_url;
 pub use extra::arc::Arc;
 use servo_util::cowarc::CowArc;
+
 pub use cssparser::*;
 pub use cssparser::ast::*;
 
@@ -470,10 +472,31 @@ pub mod longhands {
     // CSS 2.1, Section 14 - Colors and Backgrounds
 
     ${new_style_struct("Background", is_inherited=False)}
-
     ${predefined_type("background-color", "CSSColor",
                       "RGBA(RGBA { red: 0., green: 0., blue: 0., alpha: 0. }) /* transparent */")}
 
+    <%self:single_component_value name="background-image">
+            // The computed value is the same as the specified value.
+            pub use to_computed_value = super::computed_as_specified;
+            pub mod computed_value {
+                pub use extra::url::Url;
+                pub type T = Option<Url>;
+            }
+            pub type SpecifiedValue = computed_value::T;
+            #[inline] pub fn get_initial_value() -> SpecifiedValue {
+                None
+            }
+            pub fn from_component_value(component_value: &ComponentValue) -> Option<SpecifiedValue> {
+                match component_value {
+                    &ast::URL(ref url) => {
+                        let image_url = parse_url(url.as_slice(), None);
+                        Some(Some(image_url))
+                    },
+                    _ => None,
+                }
+            }
+    </%self:single_component_value>
+
 
     ${new_style_struct("Color", is_inherited=True)}
 
@@ -809,12 +832,30 @@ pub mod shorthands {
         </%self:shorthand>
     </%def>
 
-
     // TODO: other background-* properties
-    <%self:shorthand name="background" sub_properties="background-color">
-        one_component_value(input).and_then(specified::CSSColor::parse).map(|color| {
-            Longhands { background_color: Some(color) }
-        })
+    <%self:shorthand name="background" sub_properties="background-color background-image">
+                let mut color = None;
+                let mut image = None;
+                let mut any = false;
+
+                for component_value in input.skip_whitespace() {
+                    if color.is_none() {
+                        match background_color::from_component_value(component_value) {
+                            Some(v) => { color = Some(v); any = true; continue },
+                            None => ()
+                        }
+                    }
+
+                    if image.is_none() {
+                        match background_image::from_component_value(component_value) {
+                            Some(v) => { image = Some(v); any = true; continue },
+                            None => (),
+                        }
+                    }
+                    return None;
+                }
+                if any { Some(Longhands { background_color: color, background_image: image }) }
+                else { None }
     </%self:shorthand>
 
     ${four_sides_shorthand("margin", "margin-%s", "margin_top::from_component_value")}

From 7eabcbb8fe2bde54448c1255497aed4f7378e6d1 Mon Sep 17 00:00:00 2001
From: Youngmin Yoo <youngmin.yoo@samsung.com>
Date: Wed, 5 Feb 2014 16:42:35 +0900
Subject: [PATCH 2/5] Impl background-image support.

---
 src/components/main/layout/box_.rs | 38 ++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/components/main/layout/box_.rs b/src/components/main/layout/box_.rs
index bcbb0ccebd1..d50d76ccb0a 100644
--- a/src/components/main/layout/box_.rs
+++ b/src/components/main/layout/box_.rs
@@ -22,6 +22,7 @@ use servo_util::geometry::Au;
 use servo_util::geometry;
 use servo_util::range::*;
 use servo_util::namespace;
+
 use std::cast;
 use std::cell::RefCell;
 use std::cmp::ApproxEq;
@@ -937,6 +938,7 @@ impl Box {
     /// necessary.
     pub fn paint_background_if_applicable<E:ExtraDisplayListData>(
                                           &self,
+                                          builder: &DisplayListBuilder,
                                           index: uint,
                                           lists: &RefCell<DisplayListCollection<E>>,
                                           absolute_bounds: &Rect<Au>) {
@@ -959,6 +961,39 @@ impl Box {
                 lists.lists[index].append_item(SolidColorDisplayItemClass(solid_color_display_item))
             });
         }
+
+        // The background image is painted on top of the background color.
+        // Implements background image, per spec:
+        // http://www.w3.org/TR/CSS21/colors.html#background
+        match style.Background.get().background_image {
+            Some(ref image_url) => {
+                let mut holder = ImageHolder::new(image_url.clone(), builder.ctx.image_cache.clone());
+                match holder.get_image() {
+                    Some(image) => {
+                        debug!("(building display list) building background image");
+
+                        // Place the image into the display list.
+                        lists.with_mut(|lists| {
+                            let image_display_item = ~ImageDisplayItem {
+                                base: BaseDisplayItem {
+                                    bounds: *absolute_bounds,
+                                    extra: ExtraDisplayListData::new(self),
+                                },
+                                image: image.clone(),
+                            };
+                            lists.lists[index].append_item(ImageDisplayItemClass(image_display_item));
+                        });
+                    }
+                    None => {
+                        // No image data at all? Do nothing.
+                        //
+                        // TODO: Add some kind of placeholder background image.
+                        debug!("(building display list) no background image :(");
+                    }
+                }
+            }
+            None => {}
+        }
     }
 
     /// Adds the display items necessary to paint the borders of this box to a display list if
@@ -1052,7 +1087,7 @@ impl Box {
 
         self.paint_inline_background_border_if_applicable(index, lists, &absolute_box_bounds, &offset);
         // Add the background to the list, if applicable.
-        self.paint_background_if_applicable(index, lists, &absolute_box_bounds);
+        self.paint_background_if_applicable(builder, index, lists, &absolute_box_bounds);
 
         match self.specific {
             UnscannedTextBox(_) => fail!("Shouldn't see unscanned boxes here."),
@@ -1259,7 +1294,6 @@ impl Box {
         //
         // TODO: Outlines.
         self.paint_borders_if_applicable(index, lists, &absolute_box_bounds);
-
     }
 
     /// Returns the *minimum width* and *preferred width* of this box as defined by CSS 2.1.

From 49952241ad1444256118ee42f6b2ab7e8704cd8c Mon Sep 17 00:00:00 2001
From: Youngmin Yoo <youngmin.yoo@samsung.com>
Date: Thu, 6 Feb 2014 15:44:20 +0900
Subject: [PATCH 3/5] Add background test file

---
 src/test/html/background.html |  20 ++++++++++++++++++++
 src/test/ref/rust-0.png       | Bin 0 -> 4399 bytes
 2 files changed, 20 insertions(+)
 create mode 100644 src/test/html/background.html
 create mode 100644 src/test/ref/rust-0.png

diff --git a/src/test/html/background.html b/src/test/html/background.html
new file mode 100644
index 00000000000..c3bb0df99ab
--- /dev/null
+++ b/src/test/html/background.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title></title>
+	</head>
+	<style>
+		.test { background: url(rust-0.png) gray; }
+	</style>
+	<body>
+	    <div class="test" style="width:200px; height:200px; color:red;">
+	        background: url(rust-0.png) gray; width:200px; height:200px;
+	    </div>
+	    <div class="test" style="background-image: url(rust-45.png); width:200px; height:200px; color:red;">
+	        background-image: url(rust-45.png); width:200px; height:200px;
+	    </div>
+	    <div style="background: url(rust-90.png) yellow; width:200px; height:200px; border: 5px solid #000; color:blue;">
+	        background: url(rust-90.png) yellow; width:200px; height:200px; border: 5px solid #000;
+	    </div>
+	</body>
+</html>
diff --git a/src/test/ref/rust-0.png b/src/test/ref/rust-0.png
new file mode 100644
index 0000000000000000000000000000000000000000..20d93badf5e2290baba400611b888d31dc03b5af
GIT binary patch
literal 4399
zcmZ`-Wl$6V(>_WX={`d7Kn~<+IS@QJLg^5s8w8{e2`Q;Nln{{aj*~{Z8>G8afup-5
zUf!SI%=_)k?laHEzulSL4OLT-CnaJe0ssJ{ZxrAf4><H+CBS*Gu(rYT2f($4DZ>DO
z@<`$vQ@jU`<*Fes4Ja96#yk)<a|I1$0Kf|b0Qd(10M`#L|1AK(4FUjcn*adN1OR}}
zDWzUr0sz1Ps3~d5-rwI}U0od=9j&aaFfuYe<m2Gr<mBX>pP!$eo_2M0(bCdlVPRQW
zS^fL>Pf1CMf`VdeYb!rL|MBC;czAe0K|wEGyf85_xx2e7EiE-LFeoW0!N$g(nVISB
z?fvlK!@<D;Jw1I@Rh65Y+u7OK-@kwD?CidL`Qqy8%E`%jd3i}fLc+wvbaQiaczC$I
zz1`g0EGa3uyu3_FNf{j-Jvusyi;Ei=7&tyYURzu1;^Ok?(WB3wKTAnT6&4nv(P$qZ
zpNNPE0RaI*Lc-wS;Q09X_wV1&&dzFSX(=cu?Ck7(|NfnTfM9KHjf;zGWMl-1MBd)s
z>gnm#)z$Iv@X*oG0f9gX2?+}ei;$2IYHI4AKYuDKE5CX3W@u;#fk2Rwl3H3?c6WC#
zEG*R2)TpVcVK5jD4vwc!pUTS08X6jojg7UnwULpLrKhL+`}+q31YBQV@9pg=Dk|#e
z=!l4ju(PvYTwHwn_N}9%BO@b&h=?dDDapgbgNlmE(b18Cfq|Ksd2(`6MMdT7*RQW$
zy~@nY<m2Oe_Uzffz<{Z#X-rJa$;rv<*RO|%hgn!y+}+(#C=@w4xtyGwwzl^A`g&eo
z-p7w0mzI{o!^2lsS2Z;?RaI59v$I)QSvNK|s;jHtzJ05!t2;F{_2b76Ha0eCX=!tF
zb0`$*;NU<^Oq`gQ_~glx`uch=FRx#}e(mq?tE;Q`_4UEwaC>|E-@kvqd-rZ)VgdvL
zEiNt!3JO9X5HT^a<Ktr?A))f}^3>GSo}QjRfBqySB)ok25+5HwB_*Z3y*)QK7Y2iE
zZf-_JMa9L%85<jmii(DXh4J$8wzjs~*w|E5RJ63T%+Jp^Ha2#4c3N9o%gD$)fBrl+
zHnym!NLW}nIXStqveMhz+t1I>*4DP6p+Q4KLtI?EtgLKqZZ0x1l7@!H*Vp&cr%&?o
z^2No)Sy@@0o}L8-1<uaS{QUezMn+&Tcz1WVsi|pja4<A9R9|18o1448zu(NvY<hY+
zEiKK-$!Xc+d)q_PW0@(+!vQEfpu)rC3A};Bv^?ha3~fxPWob)ry$CE^USpF`S_Hv4
z*ipprIG)~A0G2=*mh204vQStz9)(j!?&~;!OnWX{FS|U!v>X|%3vAo|y!I>p?jvn-
zIzu&6I``Q{N$cx^B+Pb6+7j#8t=Frw?WT*|1~l3Ti1pvL`Jd8G{^SXcOYvM-w#te?
zQORPPX|_?7AV|9&Wlj%jZbnS9v6p8quC8WL{LUy>{GJS9-ltSdg3^Nu6BmzGR~^z|
zu124hJB%T`muTA1l!dW<fE$}w7vB;X@}aBmf>2-_8oQp@{o8)**<kg>JWvFCk1_$@
z_Zg~iPnHM>*h*mU9|!~>qKSNYxjzjd?z;C|SGU^b5=Ua`SflAV+;)~^q7&1ayr$#+
zNH!YL>LjQyhv}eKC|R;Uih?gJrP(W4^|SpVZd7jlO#SJ%T45QQatctT5>A&guJamk
z1bv9YmyH_{AqHAcnP<<t_eV^(O1|NebnKEXM%F)e_w3|F@rPhY=tw+Rfc!2$nh<i8
zqhS~ce<~z<hnu9x`4ML~-l||)G0Ws<Y_M`w{7{Vd%g~tPHcdPQkr>a({82=nN4h6O
zkNm0fBMY*Y7-_QOYgHO8!|@UB;k-9v2z`vjj)!p4*ZN`1h_cJ<TkGfua%)t*pxf3^
zMQnJ<#;&LO#RU{Wyq7DeFOLduY_$Eu46JvxH{~zY-fHn!y`k$S5-sJw@V%g7Y@?Is
zt#!|&(zS{DAX>o{X5Y>_BW0f66*vYvqJ+PHrN{f%$TsrOf%k;h(WqT9x6k1Ah*WzZ
zU>b}eXzhQ8rh_IBnlj-RQ~1!G28#|;8F}eygd3u{bmO^cs9TN!RSt6#XIT@k3=kr?
zpRZ%&nzy4cavy)h+8_51el$v@9T<so8pSGQH+Qlc*2Ku!pV2ue>crN?Kb9XSG`=9c
z`o&PLg*Iq3<XOPFg3EmZ%Or3sJO<*k?*_@MH4_)@(S}SntX6B61T*b0iHMl64ETlc
zF=XyLEG*4>VU5kDi9lRU2YBk)B5ztvhU>v%33W}$Y=|@>R$!UxIPNawY}QUMOC%x2
zwwr}zyQoFf2Cbx*BC2M|e-as2iApk5k6Ps1a9h@nJ!rhmvu^-viELg&dz7FfHEXRf
z^j5}oGIEK{M53C%{o0P@q&t%<_@DSfB+6}Aq}J2AToz&EUoU=4!hVv5%sgMNLXmo)
zao6_tsylZZGE`60(Odp;<c{G!A!RqI?%7q|Y)$zx+D%YEV|*VuTrN_6s(@K3J#W-&
zSwI9J)cqLxQnDbMUeKTVj6h<zUmXL>&&&ukH6sp2mdEy+*)=#^gYXZX;?0ciWGqeN
zVn5F5wuYF}{{8K9s{UiJIz-``skE88l4FSysswwLn13{SoYmQpoQD8XTfTJQlJu$^
zV|?<2@~g#=<WwAIY>ZM6Ja$DMg%kthEE&9mgunW;r4{2iGC>bg<X{edehTvVEV3qt
zjO@d53}o+m#$mmq8Dfq^e#^YWdjqCo?=mE;z%oIdMb7s`m;Pf59t?e;zy2cD;Hqxy
z#(^?9I<21hy2|-H(uW8o{fU?xz&{h!(Q5OqqjgRfo|UH-)e^|dZ!wXn1Ubtp6xKMc
zHb;?{gzi!4Jq^#-ocSag`IBHniF>iIEdt}X%9NQqP3^CTEpWdl!yrYWCe7M~u0AHb
zIy#BQOmc8v&jD<VBFXlS={hl^Nt#DjB|&jp=4t1Yp!~L^^EhP4sulroda9#&q&%;o
z;-x<Ud`83TU6@2qH@&%u9j;t=x<j`x$>0rTGouI~yQfZH$+6F}^;$Vup|AU@By~y^
z{7=B<^zxY>O{glqH=d5WgURo09hWsCj0!h3kqcqjQ4z~|X>j_tAgKiw9K?3p<glwH
zokzLa%>a*DA-O_FKIpmfhW&<bu>-GxkCp#W`s((uvn3Gsie#C+_?>>PbXI=0iZ4yo
z$8xkz8e8P7o&S(z!6%{gU1qRRm(PCqjaup>28Fe~BQ{AebC8iZZR%-D>o0MFu9MNB
z2y)v+Tk><JRJ>ZmlI;jVN#nZ#vZ*Fi|KFx9P)CSQR!r4Yst@0rE&^yJS;677W16yb
zCpS~L!;B%pIO=HvU+vHR>}Qu2F>C}-`r6H}3;Lbdd%R)n(5Tzu_VdYu?%%}9;|xYQ
zE}LTLemVqu!;pRX0HRxE(nnO$ddmvcqwd~koK*~;W%ky$@`|XR;7H|$Gp>Xwab{wP
z3G_*JZQTl~LlcYD9J`jOy;O~`ESwNc0{$;JFgc{s*Qr?(1BLATiHFBfH{5B|QmTe%
z|4EJQq-=w~&4+l2A<nl*1{9;6(MSQv$1y2l>K<BwNI;`DNh>Pc(`}%0O<)UF5!&EG
zH^Qc0Nli-QVrYg1sn<zlmE`pR`O3c>9r7k~(~Aa^qfpfpvJ-*<XPMZsK3HbpWT00*
zjg|3JRZiu)3A1l9=;*TGnXpDtoo1C<jYU7{k<jJm^6tj5fiUSr`XGz%m71qWCdRL4
z;BA^AuO4x}r`n5UAAkX5tFb&^IfCl%(SDaARGxv<O(U*JYtHalA$?HIt8obM{W_RU
zrzCe#F6IaaCX!7Z(>L&89q}5^AfDm54z!fl{RODoD#SKV=N8zNIZgq~SDR{vOV^~T
zuy<|{o}DAli$GN17+2gj`Kf#Pj~&}e7H}`EWIfD>0F@U3L(8{}x`YI=uDCNfGRNFN
zrIExhs7Zc3=86Nx{*1#yPv|&1mA!E{mlMl=<De14%}!%<)W341V}mc|I-He3C@G2k
z$(q*p$U5JbH#^3W^wsLC!W}a0>x*#=5p4cg(PDwgiNAeq<$sQAS7nd9Cntv<&=;go
zTnNv~-bCdqjP~`EHXJx-8N96Bpv+o--dbYU=8G%(9BM-N$q<`?Sy<Zy|4UXSQ-g!O
zz&y6amVI=1*bvE0e{PU_oG7>>5=*wn&SdXN-JKA!AbqeRYLx%5ia!*tA2^yf+l$H3
zTGP2tT(Nbp!McZSZ9!2m(#rW!i<xALRzGrRn#Rp_45@r+*AKY&L)iZs>4bJ?um82S
zQCvEtCA;43pM#?zIbvA8dziEE`_E@F=0bx-Si!2A4`I`-{tlzZkCO63NX$$qk#XVy
z<%QbMxxnMcJG}rk!$L${%~+!{p24;(4~IU0RIe~SnC@vWbc94E;(agZ?L0jREvx--
zV_&6R*e;N}`Nk*i{>($`pQNFHi6-X~vJovhBY$|j&vyw6J4v4b@j2mJRIy&2QZ4-G
zEq+^kYc~TrYsb0O)9Mo>lz}Lxot2&=s?(~NMao<^%#$X<L7DTD^9i8RV3DhscL+pE
z<huy#Q9)2uAM+Co7r|7PPj$R@(JFAt6(Yox7k1cP<9}j2!)NX7?OAutAT{8-tMTI4
zjF{(}bhPcA=4a9Af*vHp-@l_ryOBq%dYvHu!TubN$EzHVSvmcXmZ)^AhPH42-dO{J
z4<=Xv4q%C8O5c<r`?hvFojTkDfg{BQHB-UC`qXtju6l>iF`^RZ1;wCo^FQMU)}6$Y
zHo`#u-30j8_HsY7G{-9^uScxTG&xiO?>KdWk4$%pPH*^DrxCvQBVhVZmn?GxM`oz8
z59x=ao`#sZhkdsCkPgki%e;~dG38896ee5%c_St?g=U#%K3B>nAeiS~yO*>mya(5y
z=J9?MC35O!PlxGNO`d)hY%c6QF{U2c&*|tLG$+m_O0@IYJe~k0;z7g6zf?JfVP<2#
ztp6#;g7Gdi`esn7PfA6>y^!>jMh*aPx5dKprJFNU2K}bcGRq|cFXpU16`n^(=^g-%
zxgSg&`JwQkE}pE)XA>zNKrJM-lagSlxw(Il^CBnT3o~j?CzU|+v;Q^h><%P;CQ;Vu
z960&~{g>Hx=cROtt|NXZAZaHv@C*8UObnKwlGKD480ssGGUZF92*N<hH_QdFRx=Dh
z*BEh0D%~r)e^POGR~`D*V^^WXtG_qvPVXYSF;2IMpPUyCCD>Csn0ZSic4p?J>Dd-U
z2J)0voH#+eds5XErsC~)p79|enA7h{IaDeX$zLLPn6cw5#|Bm+=nc$Dd0y?fSM=;h
zM|^{{sJCNxY9E&iugRIelCF4Dg!ekf<NcClgA6iYxzH)V(FP}3JjDJ7FA%M_<2V?6
z&vY!2Zus;UI-F;w&8^Q3#>^M|N*E}yZCy#|4;^E^#DkSHd}eJa6L-Ru)LmHyg3oEM
zU6dykqF~a(-zkZdR59sx@RUg@`kKemg6`pt9{8v$<<$|YRr-`SpYT!m2k%5S_SVV=
z+s~u-*6`C=k9@4${S!<a+xf;E776wZ$dOg0oirWIFV4>`Nlg64TcP2qK$4T?*Q4^E
zclSh-<zn1~SH*48{^x!2UuXM^o5w&d=Y#i*IQ9>x)H8(adxV84!V+rkV)+070SLb!
zFF%AABB;eL426h7ALxUHK<3lV{QpmZy`zPVmFNFoP}HIP@VEc~-pH!JOQcN#{sa1U
BUCRIf

literal 0
HcmV?d00001


From a12608d2e4d44da49d8f26fc9d111b7dfd01bfd7 Mon Sep 17 00:00:00 2001
From: Youngmin Yoo <youngmin.yoo@samsung.com>
Date: Tue, 11 Feb 2014 10:56:05 +0900
Subject: [PATCH 4/5] Add a reftest for background-image

---
 src/test/ref/background_a.html | 9 +++++++++
 src/test/ref/background_b.html | 9 +++++++++
 src/test/ref/basic.list        | 1 +
 3 files changed, 19 insertions(+)
 create mode 100644 src/test/ref/background_a.html
 create mode 100644 src/test/ref/background_b.html

diff --git a/src/test/ref/background_a.html b/src/test/ref/background_a.html
new file mode 100644
index 00000000000..28bc8f6b21d
--- /dev/null
+++ b/src/test/ref/background_a.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title></title>
+</head>
+<body>
+<div class="test" style="background: url(rust-0.png); width:200px; height:200px;"></div>
+</body>
+</html>
diff --git a/src/test/ref/background_b.html b/src/test/ref/background_b.html
new file mode 100644
index 00000000000..11faa177fb7
--- /dev/null
+++ b/src/test/ref/background_b.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title></title>
+</head>
+<body>
+<img class="test" src="rust-0.png" style="width:200px; height:200px;" />
+</body>
+</html>
diff --git a/src/test/ref/basic.list b/src/test/ref/basic.list
index 290a00741ca..bfd262afecb 100644
--- a/src/test/ref/basic.list
+++ b/src/test/ref/basic.list
@@ -29,3 +29,4 @@
 == position_relative_a.html position_relative_b.html
 == attr_exists_selector.html attr_exists_selector_ref.html
 == data_img_a.html data_img_b.html
+== background_a.html background_b.html

From 7b56e75adb0002a3bd001aa61b55249c938fc60e Mon Sep 17 00:00:00 2001
From: Youngmin Yoo <youngmin.yoo@samsung.com>
Date: Wed, 19 Feb 2014 15:52:58 +0900
Subject: [PATCH 5/5] Support base_url in stylesheet

---
 src/components/script/dom/element.rs          |   4 +-
 .../script/html/hubbub_html_parser.rs         |   7 +-
 src/components/style/media_queries.rs         |   7 +-
 src/components/style/properties.rs.mako       | 129 ++++++++++++++++--
 src/components/style/stylesheets.rs           |  12 +-
 5 files changed, 133 insertions(+), 26 deletions(-)

diff --git a/src/components/script/dom/element.rs b/src/components/script/dom/element.rs
index 9ffb17c3254..2eb0553f2f6 100644
--- a/src/components/script/dom/element.rs
+++ b/src/components/script/dom/element.rs
@@ -221,7 +221,9 @@ impl Element {
 
         match local_name.as_slice() {
             "style" => {
-                self.style_attribute = Some(style::parse_style_attribute(value))
+                let doc = self.node.owner_doc();
+                let base_url = doc.document().url.clone();
+                self.style_attribute = Some(style::parse_style_attribute(value, &base_url))
             }
             "id" if abstract_self.is_in_doc() => {
                 // XXX: this dual declaration are workaround to avoid the compile error:
diff --git a/src/components/script/html/hubbub_html_parser.rs b/src/components/script/html/hubbub_html_parser.rs
index 4ba46343817..9b66e4ecb1a 100644
--- a/src/components/script/html/hubbub_html_parser.rs
+++ b/src/components/script/html/hubbub_html_parser.rs
@@ -26,7 +26,6 @@ use servo_util::url::parse_url;
 use std::cast;
 use std::cell::RefCell;
 use std::comm::{Port, SharedChan};
-use std::from_str::FromStr;
 use std::str;
 use style::Stylesheet;
 
@@ -277,7 +276,8 @@ pub fn parse_html(cx: *JSContext,
 
     debug!("Fetched page; metadata is {:?}", load_response.metadata);
 
-    let url2 = load_response.metadata.final_url.clone();
+    let base_url = load_response.metadata.final_url.clone();
+    let url2 = base_url.clone();
     let url3 = url2.clone();
 
     // Store the final URL before we start parsing, so that DOM routines
@@ -485,7 +485,6 @@ pub fn parse_html(cx: *JSContext,
             // We've reached the end of a <style> so we can submit all the text to the parser.
             unsafe {
                 let style: AbstractNode = NodeWrapping::from_hubbub_node(style);
-                let url = FromStr::from_str("http://example.com/"); // FIXME
                 let mut data = ~[];
                 debug!("iterating over children {:?}", style.first_child());
                 for child in style.children() {
@@ -496,7 +495,7 @@ pub fn parse_html(cx: *JSContext,
                 }
 
                 debug!("style data = {:?}", data);
-                let provenance = InlineProvenance(url.unwrap(), data.concat());
+                let provenance = InlineProvenance(base_url.clone(), data.concat());
                 css_chan3.send(CSSTaskNewFile(provenance));
             }
         },
diff --git a/src/components/style/media_queries.rs b/src/components/style/media_queries.rs
index 06866736305..a7ed89e8230 100644
--- a/src/components/style/media_queries.rs
+++ b/src/components/style/media_queries.rs
@@ -9,6 +9,7 @@ use cssparser::ast::*;
 use errors::{ErrorLoggerIterator, log_css_error};
 use stylesheets::{CSSRule, CSSMediaRule, parse_style_rule, parse_nested_at_rule};
 use namespaces::NamespaceMap;
+use extra::url::Url;
 
 
 pub struct MediaRule {
@@ -48,7 +49,7 @@ pub struct Device {
 
 
 pub fn parse_media_rule(rule: AtRule, parent_rules: &mut ~[CSSRule],
-                        namespaces: &NamespaceMap) {
+                        namespaces: &NamespaceMap, base_url: &Url) {
     let media_queries = parse_media_query_list(rule.prelude);
     let block = match rule.block {
         Some(block) => block,
@@ -60,9 +61,9 @@ pub fn parse_media_rule(rule: AtRule, parent_rules: &mut ~[CSSRule],
     let mut rules = ~[];
     for rule in ErrorLoggerIterator(parse_rule_list(block.move_iter())) {
         match rule {
-            QualifiedRule(rule) => parse_style_rule(rule, &mut rules, namespaces),
+            QualifiedRule(rule) => parse_style_rule(rule, &mut rules, namespaces, base_url),
             AtRule(rule) => parse_nested_at_rule(
-                rule.name.to_ascii_lower(), rule, &mut rules, namespaces),
+                rule.name.to_ascii_lower(), rule, &mut rules, namespaces, base_url),
         }
     }
     parent_rules.push(CSSMediaRule(MediaRule {
diff --git a/src/components/style/properties.rs.mako b/src/components/style/properties.rs.mako
index e8325110d1d..bdd51a702a8 100644
--- a/src/components/style/properties.rs.mako
+++ b/src/components/style/properties.rs.mako
@@ -7,6 +7,7 @@
 use std::ascii::StrAsciiExt;
 pub use servo_util::url::parse_url;
 pub use extra::arc::Arc;
+pub use extra::url::Url;
 use servo_util::cowarc::CowArc;
 
 pub use cssparser::*;
@@ -50,7 +51,9 @@ STYLE_STRUCTS = []
 THIS_STYLE_STRUCT = None
 LONGHANDS = []
 LONGHANDS_BY_NAME = {}
+LONGHANDS_WITH_URL = []
 SHORTHANDS = []
+SHORTHANDS_WITH_URL = []
 
 def new_style_struct(name, is_inherited):
     global THIS_STYLE_STRUCT
@@ -103,6 +106,32 @@ pub mod longhands {
         }
     </%def>
 
+    <%def name="url_longhand(name, no_super=False)">
+    <%
+        property = Longhand(name)
+        THIS_STYLE_STRUCT.longhands.append(property)
+        LONGHANDS_WITH_URL.append(property)
+        LONGHANDS_BY_NAME[name] = property
+    %>
+        pub mod ${property.ident} {
+            % if not no_super:
+                use super::*;
+            % endif
+            pub use self::computed_value::*;
+            ${caller.body()}
+
+            pub fn parse_declared(input: &[ComponentValue], base_url: &Url)
+                               -> Option<DeclaredValue<SpecifiedValue>> {
+                match CSSWideKeyword::parse(input) {
+                    Some(Some(keyword)) => Some(CSSWideKeyword(keyword)),
+                    Some(None) => Some(CSSWideKeyword(${
+                        "Inherit" if THIS_STYLE_STRUCT.inherited else "Initial"})),
+                    None => parse_specified(input, base_url),
+                }
+            }
+        }
+    </%def>
+
     <%def name="longhand(name, no_super=False)">
         <%self:raw_longhand name="${name}">
             ${caller.body()}
@@ -475,7 +504,7 @@ pub mod longhands {
     ${predefined_type("background-color", "CSSColor",
                       "RGBA(RGBA { red: 0., green: 0., blue: 0., alpha: 0. }) /* transparent */")}
 
-    <%self:single_component_value name="background-image">
+    <%self:url_longhand name="background-image">
             // The computed value is the same as the specified value.
             pub use to_computed_value = super::computed_as_specified;
             pub mod computed_value {
@@ -486,16 +515,29 @@ pub mod longhands {
             #[inline] pub fn get_initial_value() -> SpecifiedValue {
                 None
             }
-            pub fn from_component_value(component_value: &ComponentValue) -> Option<SpecifiedValue> {
+            pub fn parse(input: &[ComponentValue], base_url: &Url) -> Option<SpecifiedValue> {
+                from_iter(input.skip_whitespace(), base_url)
+            }
+            pub fn from_iter<'a>(mut iter: SkipWhitespaceIterator<'a>, base_url: &Url) -> Option<SpecifiedValue> {
+                match iter.next() {
+                    Some(v) => from_component_value_with_url(v, base_url),
+                    _ => None
+                }
+            }
+            pub fn from_component_value_with_url(component_value: &ComponentValue, base_url: &Url) -> Option<SpecifiedValue> {
                 match component_value {
                     &ast::URL(ref url) => {
-                        let image_url = parse_url(url.as_slice(), None);
+                        let image_url = parse_url(url.as_slice(), Some(base_url.clone()));
                         Some(Some(image_url))
                     },
                     _ => None,
                 }
             }
-    </%self:single_component_value>
+            pub fn parse_specified(input: &[ComponentValue], base_url: &Url)
+                               -> Option<DeclaredValue<SpecifiedValue>> {
+                parse(input, base_url).map(super::SpecifiedValue)
+            }
+    </%self:url_longhand>
 
 
     ${new_style_struct("Color", is_inherited=True)}
@@ -805,6 +847,24 @@ pub mod shorthands {
         }
     </%def>
 
+    <%def name="url_shorthand(name, sub_properties)">
+    <%
+        shorthand = Shorthand(name, sub_properties.split())
+        SHORTHANDS_WITH_URL.append(shorthand)
+    %>
+        pub mod ${shorthand.ident} {
+            use super::*;
+
+            struct Longhands {
+                % for sub_property in shorthand.sub_properties:
+                    ${sub_property.ident}: Option<${sub_property.ident}::SpecifiedValue>,
+                % endfor
+            }
+            pub fn parse(input: &[ComponentValue], base_url: &Url) -> Option<Longhands> {
+                ${caller.body()}
+            }
+        }
+    </%def>
     <%def name="four_sides_shorthand(name, sub_property_pattern, parser_function)">
         <%self:shorthand name="${name}" sub_properties="${
                 ' '.join(sub_property_pattern % side
@@ -833,7 +893,7 @@ pub mod shorthands {
     </%def>
 
     // TODO: other background-* properties
-    <%self:shorthand name="background" sub_properties="background-color background-image">
+    <%self:url_shorthand name="background" sub_properties="background-color background-image">
                 let mut color = None;
                 let mut image = None;
                 let mut any = false;
@@ -847,7 +907,7 @@ pub mod shorthands {
                     }
 
                     if image.is_none() {
-                        match background_image::from_component_value(component_value) {
+                        match background_image::from_component_value_with_url(component_value, base_url) {
                             Some(v) => { image = Some(v); any = true; continue },
                             None => (),
                         }
@@ -856,7 +916,7 @@ pub mod shorthands {
                 }
                 if any { Some(Longhands { background_color: color, background_image: image }) }
                 else { None }
-    </%self:shorthand>
+    </%self:url_shorthand>
 
     ${four_sides_shorthand("margin", "margin-%s", "margin_top::from_component_value")}
     ${four_sides_shorthand("padding", "padding-%s", "padding_top::from_component_value")}
@@ -1014,12 +1074,12 @@ pub struct PropertyDeclarationBlock {
 }
 
 
-pub fn parse_style_attribute(input: &str) -> PropertyDeclarationBlock {
-    parse_property_declaration_list(tokenize(input))
+pub fn parse_style_attribute(input: &str, base_url: &Url) -> PropertyDeclarationBlock {
+    parse_property_declaration_list(tokenize(input), base_url)
 }
 
 
-pub fn parse_property_declaration_list<I: Iterator<Node>>(input: I) -> PropertyDeclarationBlock {
+pub fn parse_property_declaration_list<I: Iterator<Node>>(input: I, base_url: &Url) -> PropertyDeclarationBlock {
     let mut important = ~[];
     let mut normal = ~[];
     for item in ErrorLoggerIterator(parse_declaration_list(input)) {
@@ -1029,7 +1089,7 @@ pub fn parse_property_declaration_list<I: Iterator<Node>>(input: I) -> PropertyD
             Declaration(Declaration{ location: l, name: n, value: v, important: i}) => {
                 // TODO: only keep the last valid declaration for a given name.
                 let list = if i { &mut important } else { &mut normal };
-                match PropertyDeclaration::parse(n, v, list) {
+                match PropertyDeclaration::parse(n, v, list, base_url) {
                     UnknownProperty => log_css_error(l, format!(
                         "Unsupported property: {}:{}", n, v.iter().to_css())),
                     InvalidValue => log_css_error(l, format!(
@@ -1077,6 +1137,9 @@ pub enum PropertyDeclaration {
     % for property in LONGHANDS:
         ${property.ident}_declaration(DeclaredValue<longhands::${property.ident}::SpecifiedValue>),
     % endfor
+    % for property in LONGHANDS_WITH_URL:
+        ${property.ident}_declaration(DeclaredValue<longhands::${property.ident}::SpecifiedValue>),
+    % endfor
 }
 
 
@@ -1086,9 +1149,11 @@ enum PropertyDeclarationParseResult {
     ValidDeclaration,
 }
 
+
 impl PropertyDeclaration {
     pub fn parse(name: &str, value: &[ComponentValue],
-                 result_list: &mut ~[PropertyDeclaration]) -> PropertyDeclarationParseResult {
+                 result_list: &mut ~[PropertyDeclaration],
+                 base_url: &Url) -> PropertyDeclarationParseResult {
         // FIXME: local variable to work around Rust #10683
         let name_lower = name.to_ascii_lower();
         match name_lower.as_slice() {
@@ -1100,6 +1165,14 @@ impl PropertyDeclaration {
                     }
                 )),
             % endfor
+            % for property in LONGHANDS_WITH_URL:
+                "${property.name}" => result_list.push(${property.ident}_declaration(
+                    match longhands::${property.ident}::parse_declared(value, base_url) {
+                        Some(value) => value,
+                        None => return InvalidValue,
+                    }
+                )),
+            % endfor
             % for shorthand in SHORTHANDS:
                 "${shorthand.name}" => match CSSWideKeyword::parse(value) {
                     Some(Some(keyword)) => {
@@ -1132,6 +1205,38 @@ impl PropertyDeclaration {
                     }
                 },
             % endfor
+            % for shorthand in SHORTHANDS_WITH_URL:
+                "${shorthand.name}" => match CSSWideKeyword::parse(value) {
+                    Some(Some(keyword)) => {
+                        % for sub_property in shorthand.sub_properties:
+                            result_list.push(${sub_property.ident}_declaration(
+                                CSSWideKeyword(keyword)
+                            ));
+                        % endfor
+                    },
+                    Some(None) => {
+                        % for sub_property in shorthand.sub_properties:
+                            result_list.push(${sub_property.ident}_declaration(
+                                CSSWideKeyword(${
+                                    "Inherit" if sub_property.style_struct.inherited else "Initial"})
+                            ));
+                        % endfor
+                    },
+                    None => match shorthands::${shorthand.ident}::parse(value, base_url) {
+                        Some(result) => {
+                            % for sub_property in shorthand.sub_properties:
+                                result_list.push(${sub_property.ident}_declaration(
+                                    match result.${sub_property.ident} {
+                                        Some(value) => SpecifiedValue(value),
+                                        None => CSSWideKeyword(Initial),
+                                    }
+                                ));
+                            % endfor
+                        },
+                        None => return InvalidValue,
+                    }
+                },
+            % endfor
             _ => return UnknownProperty,
         }
         ValidDeclaration
diff --git a/src/components/style/stylesheets.rs b/src/components/style/stylesheets.rs
index 0b5b1406457..6c66b707022 100644
--- a/src/components/style/stylesheets.rs
+++ b/src/components/style/stylesheets.rs
@@ -75,7 +75,7 @@ impl Stylesheet {
             match rule {
                 QualifiedRule(rule) => {
                     next_state = STATE_BODY;
-                    parse_style_rule(rule, &mut rules, &namespaces)
+                    parse_style_rule(rule, &mut rules, &namespaces, &base_url)
                 },
                 AtRule(rule) => {
                     let lower_name = rule.name.to_ascii_lower();
@@ -112,7 +112,7 @@ impl Stylesheet {
                         },
                         _ => {
                             next_state = STATE_BODY;
-                            parse_nested_at_rule(lower_name, rule, &mut rules, &namespaces)
+                            parse_nested_at_rule(lower_name, rule, &mut rules, &namespaces, &base_url)
                         },
                     }
                 },
@@ -125,14 +125,14 @@ impl Stylesheet {
 
 
 pub fn parse_style_rule(rule: QualifiedRule, parent_rules: &mut ~[CSSRule],
-                        namespaces: &NamespaceMap) {
+                        namespaces: &NamespaceMap, base_url: &Url) {
     let QualifiedRule{location: location, prelude: prelude, block: block} = rule;
     // FIXME: avoid doing this for valid selectors
     let serialized = prelude.iter().to_css();
     match selectors::parse_selector_list(prelude, namespaces) {
         Some(selectors) => parent_rules.push(CSSStyleRule(StyleRule{
             selectors: selectors,
-            declarations: properties::parse_property_declaration_list(block.move_iter())
+            declarations: properties::parse_property_declaration_list(block.move_iter(), base_url)
         })),
         None => log_css_error(location, format!(
             "Invalid/unsupported selector: {}", serialized)),
@@ -142,9 +142,9 @@ pub fn parse_style_rule(rule: QualifiedRule, parent_rules: &mut ~[CSSRule],
 
 // lower_name is passed explicitly to avoid computing it twice.
 pub fn parse_nested_at_rule(lower_name: &str, rule: AtRule,
-                            parent_rules: &mut ~[CSSRule], namespaces: &NamespaceMap) {
+                            parent_rules: &mut ~[CSSRule], namespaces: &NamespaceMap, base_url: &Url) {
     match lower_name {
-        "media" => parse_media_rule(rule, parent_rules, namespaces),
+        "media" => parse_media_rule(rule, parent_rules, namespaces, base_url),
         _ => log_css_error(rule.location, format!("Unsupported at-rule: @{:s}", lower_name))
     }
 }