forked from mirrors/gecko-dev
<!-- Please describe your changes on the following line: --> Info about the big picture and the goals of the WebGL refactor in this thread: https://groups.google.com/forum/#!topic/mozilla.dev.servo/0WMGz60kKzQ I tried to reduce this PR as much as possible as requested in the thread. I'll do separate PRs for other features (e.g.: Batch messages or use shared memory to improve frame times) or fixes. Some tips to ease the review process: - Most changes in DOM objects follow the same pattern (remove CanvasMsg wrapper and use the new sender method). - WebGLCommands are the same ones as before (moved from webrender_api). So those lines are already reviewed. - See WebGL traits in [components/canvas_traits/webgl.rs](https://github.com/servo/servo/pull/17891/files#diff-8701045d01505418701d0631d4d45562) - See WebGLThread and WR External Image bridge in [components/canvas/webgl_thread.rs](https://github.com/servo/servo/pull/17891/files#diff-281554879f39a2a041f7a69d442a5d2e) - The implementation submitted in this PR creates a single `WebGLThread` for all ScriptThread/Pipelines. See that in [components/canvas/webgl_mode/inprocess.rs](https://github.com/servo/servo/pull/17891/files#diff-250070c6c5a38c7f9fa0f5b3c101f68b) The conformance tests will help to guarantee that we don't miss anything. --- <!-- 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: --> - [x] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- 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: 90f55ea4580e2a15f7d70d0491444f18b972d450 --HG-- rename : servo/tests/unit/style/rule_tree/mod.rs => servo/components/canvas/webgl_mode/mod.rs rename : servo/components/canvas_traits/lib.rs => servo/components/canvas_traits/canvas.rs extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear extra : subtree_revision : d476816b29986c4abfd61ff3c7b46aa189f2f50a
168 lines
4.5 KiB
Rust
168 lines
4.5 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(nonzero)]
|
|
|
|
extern crate app_units;
|
|
extern crate atomic_refcell;
|
|
extern crate canvas_traits;
|
|
extern crate core;
|
|
extern crate cssparser;
|
|
extern crate euclid;
|
|
extern crate gfx_traits;
|
|
extern crate heapsize;
|
|
#[macro_use] extern crate heapsize_derive;
|
|
#[macro_use] extern crate html5ever;
|
|
extern crate ipc_channel;
|
|
extern crate libc;
|
|
#[macro_use]
|
|
extern crate log;
|
|
extern crate metrics;
|
|
extern crate msg;
|
|
extern crate net_traits;
|
|
extern crate profile_traits;
|
|
extern crate range;
|
|
extern crate script_traits;
|
|
extern crate selectors;
|
|
extern crate servo_arc;
|
|
extern crate servo_atoms;
|
|
extern crate servo_url;
|
|
extern crate style;
|
|
extern crate webrender_api;
|
|
|
|
pub mod message;
|
|
pub mod reporter;
|
|
pub mod rpc;
|
|
pub mod wrapper_traits;
|
|
|
|
use atomic_refcell::AtomicRefCell;
|
|
use canvas_traits::canvas::CanvasMsg;
|
|
use core::nonzero::NonZero;
|
|
use ipc_channel::ipc::IpcSender;
|
|
use libc::c_void;
|
|
use net_traits::image_cache::PendingImageId;
|
|
use script_traits::UntrustedNodeAddress;
|
|
use servo_url::ServoUrl;
|
|
use std::sync::atomic::AtomicIsize;
|
|
use style::data::ElementData;
|
|
|
|
#[repr(C)]
|
|
pub struct StyleData {
|
|
/// Data that the style system associates with a node. When the
|
|
/// style system is being used standalone, this is all that hangs
|
|
/// off the node. This must be first to permit the various
|
|
/// transmutations between ElementData and PersistentLayoutData.
|
|
pub element_data: AtomicRefCell<ElementData>,
|
|
|
|
/// Information needed during parallel traversals.
|
|
pub parallel: DomParallelInfo,
|
|
}
|
|
|
|
impl StyleData {
|
|
pub fn new() -> Self {
|
|
Self {
|
|
element_data: AtomicRefCell::new(ElementData::default()),
|
|
parallel: DomParallelInfo::new(),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Copy, Clone, HeapSizeOf)]
|
|
pub struct OpaqueStyleAndLayoutData {
|
|
// NB: We really store a `StyleAndLayoutData` here, so be careful!
|
|
#[ignore_heap_size_of = "TODO(#6910) Box value that should be counted but \
|
|
the type lives in layout"]
|
|
pub ptr: NonZero<*mut StyleData>
|
|
}
|
|
|
|
#[allow(unsafe_code)]
|
|
unsafe impl Send for OpaqueStyleAndLayoutData {}
|
|
|
|
/// Information that we need stored in each DOM node.
|
|
#[derive(HeapSizeOf)]
|
|
pub struct DomParallelInfo {
|
|
/// The number of children remaining to process during bottom-up traversal.
|
|
pub children_to_process: AtomicIsize,
|
|
}
|
|
|
|
impl DomParallelInfo {
|
|
pub fn new() -> DomParallelInfo {
|
|
DomParallelInfo {
|
|
children_to_process: AtomicIsize::new(0),
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
#[derive(Copy, Clone, PartialEq, Eq, Debug)]
|
|
pub enum LayoutNodeType {
|
|
Element(LayoutElementType),
|
|
Text,
|
|
}
|
|
|
|
#[derive(Copy, Clone, PartialEq, Eq, Debug)]
|
|
pub enum LayoutElementType {
|
|
Element,
|
|
HTMLCanvasElement,
|
|
HTMLIFrameElement,
|
|
HTMLImageElement,
|
|
HTMLInputElement,
|
|
HTMLObjectElement,
|
|
HTMLTableCellElement,
|
|
HTMLTableColElement,
|
|
HTMLTableElement,
|
|
HTMLTableRowElement,
|
|
HTMLTableSectionElement,
|
|
HTMLTextAreaElement,
|
|
SVGSVGElement,
|
|
}
|
|
|
|
pub enum HTMLCanvasDataSource {
|
|
WebGL(webrender_api::ImageKey),
|
|
Image(Option<IpcSender<CanvasMsg>>)
|
|
}
|
|
|
|
pub struct HTMLCanvasData {
|
|
pub source: HTMLCanvasDataSource,
|
|
pub width: u32,
|
|
pub height: u32,
|
|
}
|
|
|
|
pub struct SVGSVGData {
|
|
pub width: u32,
|
|
pub height: u32,
|
|
}
|
|
|
|
/// The address of a node known to be valid. These are sent from script to layout.
|
|
#[derive(Clone, Debug, 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_))
|
|
}
|
|
|
|
/// Whether the pending image needs to be fetched or is waiting on an existing fetch.
|
|
pub enum PendingImageState {
|
|
Unrequested(ServoUrl),
|
|
PendingResponse,
|
|
}
|
|
|
|
/// The data associated with an image that is not yet present in the image cache.
|
|
/// Used by the script thread to hold on to DOM elements that need to be repainted
|
|
/// when an image fetch is complete.
|
|
pub struct PendingImage {
|
|
pub state: PendingImageState,
|
|
pub node: UntrustedNodeAddress,
|
|
pub id: PendingImageId,
|
|
}
|