aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-07-29 02:26:25 -0500
committerGitHub <noreply@github.com>2016-07-29 02:26:25 -0500
commit11ad48f8e3ff12f30ef2708ae87d7ad09277e5bf (patch)
tree16912db2d339fcb23583d51c0c21fce984542359 /components/script/dom
parent93eb35d358cc0e6c215a5d93e588a7921a5edb04 (diff)
parentbaa339f4afcef0adf1065cdb4eb4c436a3be5a58 (diff)
downloadservo-11ad48f8e3ff12f30ef2708ae87d7ad09277e5bf.tar.gz
servo-11ad48f8e3ff12f30ef2708ae87d7ad09277e5bf.zip
Auto merge of #12648 - heycam:store-extra-data, r=Manishearth
Store UrlExtraData in {specified,computed}::Image::Url. <!-- Please describe your changes on the following line: --> This stores a `UrlExtraData` object in `specified::Image::Url` and `computed::Image::Url`, so that geckolib can use the base/principal to create Gecko `ImageValue`s. (I'll do that in the followup to support background-image; want to get this in first.) r? @Manishearth --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [X] These changes do not require tests because existing tests should be sufficient <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- 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/12648) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom')
-rw-r--r--components/script/dom/element.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs
index a4c1ed28583..ae3c31d151c 100644
--- a/components/script/dom/element.rs
+++ b/components/script/dom/element.rs
@@ -347,7 +347,8 @@ impl LayoutElementHelpers for LayoutJS<Element> {
if let Some(url) = background {
hints.push(from_declaration(
PropertyDeclaration::BackgroundImage(DeclaredValue::Value(
- background_image::SpecifiedValue(Some(specified::Image::Url(url)))))));
+ background_image::SpecifiedValue(Some(
+ specified::Image::Url(url, specified::UrlExtraData { })))))));
}
let color = if let Some(this) = self.downcast::<HTMLFontElement>() {