forked from mirrors/gecko-dev
c710b104be
Background: The changes to Servo code to support Stylo began in the `selectors` crate with making pseudo-elements generic, defined be the user, so that different users (such as Servo and Gecko/Stylo) could have a different set of pseudo-elements supported and parsed. Adding a trait makes sense there since `selectors` is in its own repository and has others users (or at least [one](https://github.com/SimonSapin/kuchiki)). Then we kind of kept going with the same pattern and added a bunch of traits in the `style` crate to make everything generic, allowing Servo and Gecko/Stylo to do things differently. But we’ve also added a `gecko` Cargo feature to do conditional compilation, at first to enable or disable some CSS properties and values in the Mako templates. Since we’re doing conditional compilation anyway, it’s often easier and simpler to do it more (with `#[cfg(feature = "gecko")]` and `#[cfg(feature = "servo")]`) that to keep adding traits and making everything generic. When a type is generic, any method that we want to call on it needs to be part of some trait. ---- The first several commits move some code around, mostly from `geckolib` to `style` (with `#[cfg(feature = "gecko")]`) but otherwise don’t change much. The following commits remove some traits and many type parameters through the `style` crate, replacing them with pairs of conditionally-compiled API-compatible items (types, methods, …). Simplifying code is nice to make it more maintainable, but this is motivated by another change described in https://github.com/servo/servo/pull/12391#issuecomment-232183942. (Porting Servo for that change proved difficult because some code in the `style` crate was becoming generic over `String` vs `Atom`, and this PR will help make that concrete. That change, in turn, is motivated by removing geckolib’s `[replace]` override for string-cache, in order to enable using a single Cargo "workspace" in this repository.) r? @bholley --- <!-- 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 #__ (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [x] These changes do not require new tests because refactoring <!-- 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: 2d01d41a506bcbc7f26a2284b9f42390d6ef96ab --HG-- rename : servo/ports/geckolib/selector_impl.rs => servo/components/style/gecko_selector_impl.rs rename : servo/ports/geckolib/values.rs => servo/components/style/gecko_values.rs rename : servo/ports/geckolib/properties.mako.rs => servo/components/style/properties/gecko.mako.rs
116 lines
3 KiB
Rust
116 lines
3 KiB
Rust
/* 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/. */
|
|
|
|
//! This module contains traits in script used generically in the rest of Servo.
|
|
//! The traits are here instead of in script so that these modules won't have
|
|
//! to depend on script.
|
|
|
|
#![deny(unsafe_code)]
|
|
#![feature(box_syntax)]
|
|
#![feature(custom_attribute)]
|
|
#![feature(custom_derive)]
|
|
#![feature(nonzero)]
|
|
#![feature(plugin)]
|
|
#![plugin(heapsize_plugin)]
|
|
#![plugin(plugins)]
|
|
|
|
extern crate app_units;
|
|
#[allow(unused_extern_crates)]
|
|
#[macro_use]
|
|
extern crate bitflags;
|
|
extern crate canvas_traits;
|
|
extern crate core;
|
|
extern crate cssparser;
|
|
extern crate euclid;
|
|
extern crate gfx_traits;
|
|
extern crate heapsize;
|
|
extern crate ipc_channel;
|
|
extern crate libc;
|
|
#[macro_use]
|
|
extern crate log;
|
|
extern crate msg;
|
|
extern crate net_traits;
|
|
extern crate profile_traits;
|
|
extern crate range;
|
|
extern crate script_traits;
|
|
extern crate selectors;
|
|
#[macro_use(atom, ns)]
|
|
extern crate string_cache;
|
|
extern crate style;
|
|
extern crate url;
|
|
extern crate util;
|
|
|
|
pub mod message;
|
|
pub mod reporter;
|
|
pub mod restyle_damage;
|
|
pub mod rpc;
|
|
pub mod wrapper_traits;
|
|
|
|
use canvas_traits::CanvasMsg;
|
|
use core::nonzero::NonZero;
|
|
use ipc_channel::ipc::IpcSender;
|
|
use libc::c_void;
|
|
use restyle_damage::RestyleDamage;
|
|
use style::data::PrivateStyleData;
|
|
use style::refcell::RefCell;
|
|
|
|
pub struct PartialStyleAndLayoutData {
|
|
pub style_data: PrivateStyleData,
|
|
pub restyle_damage: RestyleDamage,
|
|
}
|
|
|
|
#[derive(Copy, Clone, HeapSizeOf)]
|
|
pub struct OpaqueStyleAndLayoutData {
|
|
#[ignore_heap_size_of = "TODO(#6910) Box value that should be counted but \
|
|
the type lives in layout"]
|
|
pub ptr: NonZero<*mut RefCell<PartialStyleAndLayoutData>>
|
|
}
|
|
|
|
#[allow(unsafe_code)]
|
|
unsafe impl Send for OpaqueStyleAndLayoutData {}
|
|
|
|
#[derive(Copy, Clone, PartialEq, Eq, Debug)]
|
|
pub enum LayoutNodeType {
|
|
Comment,
|
|
Document,
|
|
DocumentFragment,
|
|
DocumentType,
|
|
Element(LayoutElementType),
|
|
ProcessingInstruction,
|
|
Text,
|
|
}
|
|
|
|
#[derive(Copy, Clone, PartialEq, Eq, Debug)]
|
|
pub enum LayoutElementType {
|
|
Element,
|
|
HTMLCanvasElement,
|
|
HTMLIFrameElement,
|
|
HTMLImageElement,
|
|
HTMLInputElement,
|
|
HTMLObjectElement,
|
|
HTMLTableCellElement,
|
|
HTMLTableColElement,
|
|
HTMLTableElement,
|
|
HTMLTableRowElement,
|
|
HTMLTableSectionElement,
|
|
HTMLTextAreaElement,
|
|
}
|
|
|
|
pub struct HTMLCanvasData {
|
|
pub ipc_renderer: Option<IpcSender<CanvasMsg>>,
|
|
pub width: u32,
|
|
pub height: u32,
|
|
}
|
|
|
|
/// The address of a node known to be valid. These are sent from script to layout.
|
|
#[derive(Clone, PartialEq, Eq, Copy)]
|
|
pub struct TrustedNodeAddress(pub *const c_void);
|
|
|
|
#[allow(unsafe_code)]
|
|
unsafe impl Send for TrustedNodeAddress {}
|
|
|
|
pub fn is_image_data(uri: &str) -> bool {
|
|
static TYPES: &'static [&'static str] = &["data:image/png", "data:image/gif", "data:image/jpeg"];
|
|
TYPES.iter().any(|&type_| uri.starts_with(type_))
|
|
}
|