aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-04-12 01:51:56 -0500
committerGitHub <noreply@github.com>2017-04-12 01:51:56 -0500
commita093b0a087d45bff0bb8a7039c8bfb8ec6706442 (patch)
tree56bfe2427f5ce67ca838d7a7dbb9ee8b09c2cb7e
parentc8cd70f333d41864ff7bf7dce84301509c71d1d6 (diff)
parentfdbf0f2aafcf97aacd1a7475e9178bb1b4d01a94 (diff)
downloadservo-a093b0a087d45bff0bb8a7039c8bfb8ec6706442.tar.gz
servo-a093b0a087d45bff0bb8a7039c8bfb8ec6706442.zip
Auto merge of #16361 - KuoE0:bug-1354000, r=heycam
Make stylo recognize -moz-crisp-edges keyword. <!-- Please describe your changes on the following line: --> See [Bug 1354000](https://bugzilla.mozilla.org/show_bug.cgi?id=1354000). --- <!-- 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 - [X] These changes fix [Bug 1354000](https://bugzilla.mozilla.org/show_bug.cgi?id=1354000) <!-- Either: --> - [X] These changes do not require tests because the they're in gecko. <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- 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/16361) <!-- Reviewable:end -->
-rw-r--r--components/style/properties/longhand/inherited_box.mako.rs9
1 files changed, 5 insertions, 4 deletions
diff --git a/components/style/properties/longhand/inherited_box.mako.rs b/components/style/properties/longhand/inherited_box.mako.rs
index f0d316172e1..c5a121a794f 100644
--- a/components/style/properties/longhand/inherited_box.mako.rs
+++ b/components/style/properties/longhand/inherited_box.mako.rs
@@ -70,13 +70,14 @@ ${helpers.single_keyword("color-adjust",
animation_type="none",
spec="https://drafts.csswg.org/css-color/#propdef-color-adjust")}
-<% image_rendering_custom_consts = { "crisp-edges": "CRISPEDGES" } %>
+<% image_rendering_custom_consts = { "crisp-edges": "CRISPEDGES",
+ "-moz-crisp-edges": "CRISPEDGES" } %>
// According to to CSS-IMAGES-3, `optimizespeed` and `optimizequality` are synonyms for `auto`
// And, firefox doesn't support `pixelated` yet (https://bugzilla.mozilla.org/show_bug.cgi?id=856337)
${helpers.single_keyword("image-rendering",
- "auto crisp-edges",
- extra_gecko_values="optimizespeed optimizequality",
- extra_servo_values="pixelated",
+ "auto",
+ extra_gecko_values="optimizespeed optimizequality -moz-crisp-edges",
+ extra_servo_values="pixelated crisp-edges",
custom_consts=image_rendering_custom_consts,
animation_type="none",
spec="https://drafts.csswg.org/css-images/#propdef-image-rendering")}