Previously, `string-cache` defined:
* An string-like `Atom` type,
* An `atom!("foo")` macro that expands to a value of that type, for a set of strings known at compile-time,
* A `struct Namespace(Atom);` type
* A `ns!(html)` macro that maps known prefixed to `Namespace` values with the corresponding namespace URL.
Adding a string to the static set required making a change to the `string-cache` crate.
With 0.3, the `Atom` type is now generic, with a type parameter that provides a set of static strings. We can have multiple such sets, defined in different crates. The `string_cache_codegen` crate, to be used in build scripts, generates code that defines such a set, a new atom type (a type alias for `Atom<_>` with the type parameter set), and an `atom!`-like macro.
The html5ever repository has a new `html5ever_atoms` crate that defines three such types: `Prefix`, `Namespace`, and `LocalName` (with respective `namespace_prefix!`, `namespace_url!`, and `local_name!` macros). It also defines the `ns!` macro like before.
This repository has a new `servo_atoms` crate in `components/atoms` that, for now, defines a single `Atom` type (and `atom!`) macro. (`servo_atoms::Atom` is defined as something like `type Atom = string_cache::Atom<ServoStaticStringSet>;`, so overall there’s now two types named `Atom`.)
In this PR, `servo_atoms::Atom` is used for everything else that was `string_cache::Atom` before. But more atom types can be defined as needed. Two reasons to do this are to auto-generate the set of static strings (I’m planning to do this for CSS property names, which is the motivation for this change), or to have the type system help us avoid mix up unrelated things (this is why we had a `Namespace` type ever before this change).
Introducing new types helped me find a bug: when creating a new attribute `dom::Element::set_style_attr`, would pass `Some(atom!("style"))` instead of `None` (now `Option<html5ever_atoms::Prefix>` instead of `Option<string_cache::Atom>`) to the `prefix` argument of `Attr::new`. I suppose the author of that code confused it with the `local_name` argument.
---
Note that Stylo is not affected by any of this. The `gecko_string_cache` module is unchanged, with a single `Atom` type. The `style` crate conditionally compiles `Prefix` and `LocalName` re-exports for that are both `gecko_string_cache::Atom` on stylo.
---
<!-- 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
- [ ] These changes do not require tests because _____
<!-- 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: 5b4cc9568dbd5c15e5d2fbc62719172f11566ffa
148 lines
5.2 KiB
Rust
148 lines
5.2 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/. */
|
|
|
|
use {OpaqueStyleAndLayoutData, TrustedNodeAddress};
|
|
use app_units::Au;
|
|
use euclid::point::Point2D;
|
|
use euclid::rect::Rect;
|
|
use gfx_traits::Epoch;
|
|
use ipc_channel::ipc::{IpcReceiver, IpcSender};
|
|
use msg::constellation_msg::PipelineId;
|
|
use net_traits::image_cache_thread::ImageCacheThread;
|
|
use profile_traits::mem::ReportsChan;
|
|
use rpc::LayoutRPC;
|
|
use script_traits::{ConstellationControlMsg, LayoutControlMsg};
|
|
use script_traits::{LayoutMsg as ConstellationMsg, StackingContextScrollState, WindowSizeData};
|
|
use servo_atoms::Atom;
|
|
use std::sync::Arc;
|
|
use std::sync::mpsc::{Receiver, Sender};
|
|
use style::context::ReflowGoal;
|
|
use style::selector_impl::PseudoElement;
|
|
use style::stylesheets::Stylesheet;
|
|
use url::Url;
|
|
|
|
/// Asynchronous messages that script can send to layout.
|
|
pub enum Msg {
|
|
/// Adds the given stylesheet to the document.
|
|
AddStylesheet(Arc<Stylesheet>),
|
|
|
|
/// Puts a document into quirks mode, causing the quirks mode stylesheet to be loaded.
|
|
SetQuirksMode,
|
|
|
|
/// Requests a reflow.
|
|
Reflow(ScriptReflow),
|
|
|
|
/// Get an RPC interface.
|
|
GetRPC(Sender<Box<LayoutRPC + Send>>),
|
|
|
|
/// Requests that the layout thread render the next frame of all animations.
|
|
TickAnimations,
|
|
|
|
/// Updates layout's timer for animation testing from script.
|
|
///
|
|
/// The inner field is the number of *milliseconds* to advance, and the bool
|
|
/// field is whether animations should be force-ticked.
|
|
AdvanceClockMs(i32, bool),
|
|
|
|
/// Requests that the layout thread reflow with a newly-loaded Web font.
|
|
ReflowWithNewlyLoadedWebFont,
|
|
|
|
/// Destroys layout data associated with a DOM node.
|
|
///
|
|
/// TODO(pcwalton): Maybe think about batching to avoid message traffic.
|
|
ReapStyleAndLayoutData(OpaqueStyleAndLayoutData),
|
|
|
|
/// Requests that the layout thread measure its memory usage. The resulting reports are sent back
|
|
/// via the supplied channel.
|
|
CollectReports(ReportsChan),
|
|
|
|
/// Requests that the layout thread enter a quiescent state in which no more messages are
|
|
/// accepted except `ExitMsg`. A response message will be sent on the supplied channel when
|
|
/// this happens.
|
|
PrepareToExit(Sender<()>),
|
|
|
|
/// Requests that the layout thread immediately shut down. There must be no more nodes left after
|
|
/// this, or layout will crash.
|
|
ExitNow,
|
|
|
|
/// Get the last epoch counter for this layout thread.
|
|
GetCurrentEpoch(IpcSender<Epoch>),
|
|
|
|
/// Asks the layout thread whether any Web fonts have yet to load (if true, loads are pending;
|
|
/// false otherwise).
|
|
GetWebFontLoadState(IpcSender<bool>),
|
|
|
|
/// Creates a new layout thread.
|
|
///
|
|
/// This basically exists to keep the script-layout dependency one-way.
|
|
CreateLayoutThread(NewLayoutThreadInfo),
|
|
|
|
/// Set the final Url.
|
|
SetFinalUrl(Url),
|
|
|
|
/// Tells layout about the new scrolling offsets of each scrollable stacking context.
|
|
SetStackingContextScrollStates(Vec<StackingContextScrollState>),
|
|
}
|
|
|
|
|
|
/// Any query to perform with this reflow.
|
|
#[derive(PartialEq)]
|
|
pub enum ReflowQueryType {
|
|
NoQuery,
|
|
ContentBoxQuery(TrustedNodeAddress),
|
|
ContentBoxesQuery(TrustedNodeAddress),
|
|
NodeOverflowQuery(TrustedNodeAddress),
|
|
HitTestQuery(Point2D<f32>, Point2D<f32>, bool),
|
|
NodeGeometryQuery(TrustedNodeAddress),
|
|
NodeScrollGeometryQuery(TrustedNodeAddress),
|
|
ResolvedStyleQuery(TrustedNodeAddress, Option<PseudoElement>, Atom),
|
|
OffsetParentQuery(TrustedNodeAddress),
|
|
MarginStyleQuery(TrustedNodeAddress),
|
|
}
|
|
|
|
/// Information needed for a reflow.
|
|
pub struct Reflow {
|
|
/// The goal of reflow: either to render to the screen or to flush layout info for script.
|
|
pub goal: ReflowGoal,
|
|
/// A clipping rectangle for the page, an enlarged rectangle containing the viewport.
|
|
pub page_clip_rect: Rect<Au>,
|
|
}
|
|
|
|
/// Information needed for a script-initiated reflow.
|
|
pub struct ScriptReflow {
|
|
/// General reflow data.
|
|
pub reflow_info: Reflow,
|
|
/// The document node.
|
|
pub document: TrustedNodeAddress,
|
|
/// The document's list of stylesheets.
|
|
pub document_stylesheets: Vec<Arc<Stylesheet>>,
|
|
/// Whether the document's stylesheets have changed since the last script reflow.
|
|
pub stylesheets_changed: bool,
|
|
/// The current window size.
|
|
pub window_size: WindowSizeData,
|
|
/// The channel that we send a notification to.
|
|
pub script_join_chan: Sender<()>,
|
|
/// The type of query if any to perform during this reflow.
|
|
pub query_type: ReflowQueryType,
|
|
}
|
|
|
|
impl Drop for ScriptReflow {
|
|
fn drop(&mut self) {
|
|
self.script_join_chan.send(()).unwrap();
|
|
}
|
|
}
|
|
|
|
pub struct NewLayoutThreadInfo {
|
|
pub id: PipelineId,
|
|
pub url: Url,
|
|
pub is_parent: bool,
|
|
pub layout_pair: (Sender<Msg>, Receiver<Msg>),
|
|
pub pipeline_port: IpcReceiver<LayoutControlMsg>,
|
|
pub constellation_chan: IpcSender<ConstellationMsg>,
|
|
pub script_chan: IpcSender<ConstellationControlMsg>,
|
|
pub image_cache_thread: ImageCacheThread,
|
|
pub content_process_shutdown_chan: IpcSender<()>,
|
|
pub layout_threads: usize,
|
|
}
|