2015-09-04 15:46:11 +03:00
|
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
|
2016-12-31 14:19:02 +03:00
|
|
|
//! Helper types for the `@viewport` rule.
|
|
|
|
|
2017-10-24 20:02:05 +03:00
|
|
|
use {CSSPixel, PinchZoomFactor, ParseError, ToCss};
|
|
|
|
use cssparser::Parser;
|
2017-06-14 17:25:05 +03:00
|
|
|
use euclid::TypedSize2D;
|
2017-11-09 15:49:29 +03:00
|
|
|
#[allow(unused_imports)] use std::ascii::AsciiExt;
|
2015-09-04 15:46:11 +03:00
|
|
|
use std::fmt;
|
|
|
|
|
|
|
|
define_css_keyword_enum!(UserZoom:
|
|
|
|
"zoom" => Zoom,
|
|
|
|
"fixed" => Fixed);
|
|
|
|
|
|
|
|
define_css_keyword_enum!(Orientation:
|
|
|
|
"auto" => Auto,
|
|
|
|
"portrait" => Portrait,
|
|
|
|
"landscape" => Landscape);
|
|
|
|
|
2016-12-31 14:19:02 +03:00
|
|
|
/// A set of viewport descriptors:
|
|
|
|
///
|
2017-10-18 00:04:10 +03:00
|
|
|
/// <https://drafts.csswg.org/css-device-adapt/#viewport-desc>
|
2016-06-22 17:43:20 +03:00
|
|
|
#[derive(Clone, Debug, PartialEq)]
|
servo: Merge #18938 - Replace all uses of the `heapsize` crate with `malloc_size_of` (from nnethercote:bug-1409255); r=SimonSapin
Servo currently uses `heapsize`, but Stylo/Gecko use `malloc_size_of`.
`malloc_size_of` is better -- it handles various cases that `heapsize` does not
-- so this patch changes Servo to use `malloc_size_of`.
This patch makes the following changes to the `malloc_size_of` crate.
- Adds `MallocSizeOf` trait implementations for numerous types, some built-in
(e.g. `VecDeque`), some external and Servo-only (e.g. `string_cache`).
- Makes `enclosing_size_of_op` optional, because vanilla jemalloc doesn't
support that operation.
- For `HashSet`/`HashMap`, falls back to a computed estimate when
`enclosing_size_of_op` isn't available.
- Adds an extern "C" `malloc_size_of` function that does the actual heap
measurement; this is based on the same functions from the `heapsize` crate.
This patch makes the following changes elsewhere.
- Converts all the uses of `heapsize` to instead use `malloc_size_of`.
- Disables the "heapsize"/"heap_size" feature for the external crates that
provide it.
- Removes the `HeapSizeOf` implementation from `hashglobe`.
- Adds `ignore` annotations to a few `Rc`/`Arc`, because `malloc_size_of`
doesn't derive those types, unlike `heapsize`.
<!-- Please describe your changes on the following line: -->
---
<!-- 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 https://bugzilla.mozilla.org/show_bug.cgi?id=1409255
<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because testing is on the Gecko side.
<!-- 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. -->
Source-Repo: https://github.com/servo/servo
Source-Revision: 4c538b642e4bdfbf42c522c5a59c258a6d14546e
--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : f9a6feed1088d0b0be2b55d7f0c2ec9c594ac33b
2017-10-18 21:56:05 +03:00
|
|
|
#[cfg_attr(feature = "servo", derive(Deserialize, Serialize, MallocSizeOf))]
|
2015-09-04 15:46:11 +03:00
|
|
|
pub struct ViewportConstraints {
|
2016-12-31 14:19:02 +03:00
|
|
|
/// Width and height:
|
|
|
|
/// * https://drafts.csswg.org/css-device-adapt/#width-desc
|
|
|
|
/// * https://drafts.csswg.org/css-device-adapt/#height-desc
|
2017-02-24 03:01:16 +03:00
|
|
|
pub size: TypedSize2D<f32, CSSPixel>,
|
2017-10-18 00:04:10 +03:00
|
|
|
/// <https://drafts.csswg.org/css-device-adapt/#zoom-desc>
|
2017-02-24 03:01:16 +03:00
|
|
|
pub initial_zoom: PinchZoomFactor,
|
2017-10-18 00:04:10 +03:00
|
|
|
/// <https://drafts.csswg.org/css-device-adapt/#min-max-width-desc>
|
2017-02-24 03:01:16 +03:00
|
|
|
pub min_zoom: Option<PinchZoomFactor>,
|
2017-10-18 00:04:10 +03:00
|
|
|
/// <https://drafts.csswg.org/css-device-adapt/#min-max-width-desc>
|
2017-02-24 03:01:16 +03:00
|
|
|
pub max_zoom: Option<PinchZoomFactor>,
|
2017-10-18 00:04:10 +03:00
|
|
|
/// <https://drafts.csswg.org/css-device-adapt/#user-zoom-desc>
|
2015-09-04 15:46:11 +03:00
|
|
|
pub user_zoom: UserZoom,
|
2017-10-18 00:04:10 +03:00
|
|
|
/// <https://drafts.csswg.org/css-device-adapt/#orientation-desc>
|
2015-09-04 15:46:11 +03:00
|
|
|
pub orientation: Orientation
|
|
|
|
}
|
|
|
|
|
|
|
|
impl ToCss for ViewportConstraints {
|
|
|
|
fn to_css<W>(&self, dest: &mut W) -> fmt::Result
|
|
|
|
where W: fmt::Write
|
|
|
|
{
|
2017-09-04 21:14:44 +03:00
|
|
|
dest.write_str("@viewport { width: ")?;
|
|
|
|
self.size.width.to_css(dest)?;
|
|
|
|
|
|
|
|
dest.write_str("px; height: ")?;
|
|
|
|
self.size.height.to_css(dest)?;
|
|
|
|
|
|
|
|
dest.write_str("px; zoom: ")?;
|
|
|
|
self.initial_zoom.get().to_css(dest)?;
|
|
|
|
|
2015-09-04 15:46:11 +03:00
|
|
|
if let Some(min_zoom) = self.min_zoom {
|
2017-09-04 21:14:44 +03:00
|
|
|
dest.write_str("; min-zoom: ")?;
|
|
|
|
min_zoom.get().to_css(dest)?;
|
2015-09-04 15:46:11 +03:00
|
|
|
}
|
2017-09-04 21:14:44 +03:00
|
|
|
|
2015-09-04 15:46:11 +03:00
|
|
|
if let Some(max_zoom) = self.max_zoom {
|
2017-09-04 21:14:44 +03:00
|
|
|
dest.write_str("; max-zoom: ")?;
|
|
|
|
max_zoom.get().to_css(dest)?;
|
2015-09-04 15:46:11 +03:00
|
|
|
}
|
2017-09-04 21:14:44 +03:00
|
|
|
|
|
|
|
dest.write_str("; user-zoom: ")?;
|
|
|
|
self.user_zoom.to_css(dest)?;
|
|
|
|
|
|
|
|
dest.write_str("; orientation: ")?;
|
|
|
|
self.orientation.to_css(dest)?;
|
|
|
|
dest.write_str("; }")
|
2015-09-04 15:46:11 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-10-18 00:04:10 +03:00
|
|
|
/// <https://drafts.csswg.org/css-device-adapt/#descdef-viewport-zoom>
|
2017-08-24 01:18:31 +03:00
|
|
|
#[derive(Clone, Copy, Debug, PartialEq)]
|
servo: Merge #18938 - Replace all uses of the `heapsize` crate with `malloc_size_of` (from nnethercote:bug-1409255); r=SimonSapin
Servo currently uses `heapsize`, but Stylo/Gecko use `malloc_size_of`.
`malloc_size_of` is better -- it handles various cases that `heapsize` does not
-- so this patch changes Servo to use `malloc_size_of`.
This patch makes the following changes to the `malloc_size_of` crate.
- Adds `MallocSizeOf` trait implementations for numerous types, some built-in
(e.g. `VecDeque`), some external and Servo-only (e.g. `string_cache`).
- Makes `enclosing_size_of_op` optional, because vanilla jemalloc doesn't
support that operation.
- For `HashSet`/`HashMap`, falls back to a computed estimate when
`enclosing_size_of_op` isn't available.
- Adds an extern "C" `malloc_size_of` function that does the actual heap
measurement; this is based on the same functions from the `heapsize` crate.
This patch makes the following changes elsewhere.
- Converts all the uses of `heapsize` to instead use `malloc_size_of`.
- Disables the "heapsize"/"heap_size" feature for the external crates that
provide it.
- Removes the `HeapSizeOf` implementation from `hashglobe`.
- Adds `ignore` annotations to a few `Rc`/`Arc`, because `malloc_size_of`
doesn't derive those types, unlike `heapsize`.
<!-- Please describe your changes on the following line: -->
---
<!-- 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 https://bugzilla.mozilla.org/show_bug.cgi?id=1409255
<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because testing is on the Gecko side.
<!-- 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. -->
Source-Repo: https://github.com/servo/servo
Source-Revision: 4c538b642e4bdfbf42c522c5a59c258a6d14546e
--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : f9a6feed1088d0b0be2b55d7f0c2ec9c594ac33b
2017-10-18 21:56:05 +03:00
|
|
|
#[cfg_attr(feature = "servo", derive(MallocSizeOf))]
|
2015-09-04 15:46:11 +03:00
|
|
|
pub enum Zoom {
|
2016-12-31 14:19:02 +03:00
|
|
|
/// A number value.
|
2015-09-04 15:46:11 +03:00
|
|
|
Number(f32),
|
2016-12-31 14:19:02 +03:00
|
|
|
/// A percentage value.
|
2015-09-04 15:46:11 +03:00
|
|
|
Percentage(f32),
|
2016-12-31 14:19:02 +03:00
|
|
|
/// The `auto` keyword.
|
2015-09-04 15:46:11 +03:00
|
|
|
Auto,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl ToCss for Zoom {
|
|
|
|
fn to_css<W>(&self, dest: &mut W) -> fmt::Result
|
2016-12-31 14:19:02 +03:00
|
|
|
where W: fmt::Write,
|
2015-09-04 15:46:11 +03:00
|
|
|
{
|
|
|
|
match *self {
|
2017-09-04 21:14:44 +03:00
|
|
|
Zoom::Number(number) => number.to_css(dest),
|
|
|
|
Zoom::Auto => dest.write_str("auto"),
|
|
|
|
Zoom::Percentage(percentage) => {
|
|
|
|
(percentage * 100.).to_css(dest)?;
|
|
|
|
dest.write_char('%')
|
|
|
|
}
|
2015-09-04 15:46:11 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Zoom {
|
2016-12-31 14:19:02 +03:00
|
|
|
/// Parse a zoom value per:
|
|
|
|
///
|
2017-10-18 00:04:10 +03:00
|
|
|
/// <https://drafts.csswg.org/css-device-adapt/#descdef-viewport-zoom>
|
2017-06-10 00:31:48 +03:00
|
|
|
pub fn parse<'i, 't>(input: &mut Parser<'i, 't>) -> Result<Zoom, ParseError<'i>> {
|
2017-10-31 02:25:45 +03:00
|
|
|
use ParsingMode;
|
2015-09-04 15:46:11 +03:00
|
|
|
use cssparser::Token;
|
2017-09-13 13:20:20 +03:00
|
|
|
use values::specified::AllowedNumericType::NonNegative;
|
2015-09-04 15:46:11 +03:00
|
|
|
|
2017-10-10 20:31:24 +03:00
|
|
|
let location = input.current_source_location();
|
2017-07-24 16:27:00 +03:00
|
|
|
match *input.next()? {
|
2017-06-14 05:25:09 +03:00
|
|
|
// TODO: This parse() method should take ParserContext as an
|
|
|
|
// argument, and pass ParsingMode owned by the ParserContext to
|
2017-10-31 02:25:45 +03:00
|
|
|
// is_ok() instead of using ParsingMode::DEFAULT directly.
|
2017-06-14 05:25:09 +03:00
|
|
|
// In order to do so, we might want to move these stuff into style::stylesheets::viewport_rule.
|
2017-10-31 02:25:45 +03:00
|
|
|
Token::Percentage { unit_value, .. } if NonNegative.is_ok(ParsingMode::DEFAULT, unit_value) => {
|
2017-06-16 16:09:52 +03:00
|
|
|
Ok(Zoom::Percentage(unit_value))
|
|
|
|
}
|
2017-10-31 02:25:45 +03:00
|
|
|
Token::Number { value, .. } if NonNegative.is_ok(ParsingMode::DEFAULT, value) => {
|
2017-06-16 16:09:52 +03:00
|
|
|
Ok(Zoom::Number(value))
|
|
|
|
}
|
|
|
|
Token::Ident(ref value) if value.eq_ignore_ascii_case("auto") => {
|
|
|
|
Ok(Zoom::Auto)
|
|
|
|
}
|
2017-10-10 20:31:24 +03:00
|
|
|
ref t => Err(location.new_unexpected_token_error(t.clone()))
|
2015-09-04 15:46:11 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-12-31 14:19:02 +03:00
|
|
|
/// Get this zoom value as a float value. Returns `None` if the value is the
|
|
|
|
/// `auto` keyword.
|
2015-09-04 15:46:11 +03:00
|
|
|
#[inline]
|
|
|
|
pub fn to_f32(&self) -> Option<f32> {
|
|
|
|
match *self {
|
|
|
|
Zoom::Number(number) => Some(number as f32),
|
|
|
|
Zoom::Percentage(percentage) => Some(percentage as f32),
|
|
|
|
Zoom::Auto => None
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|