Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Introduce MainThreadScriptMsg::RegisterPaintWorklet

Browse source 
This avoids the need for a generic task to send messages to the layout thread
through the main script thread.
This commit is contained in:
Anthony Ramine 2017-09-17 09:57:12 +02:00
parent 95dc54d216
commit f58207b851
4 changed files with 67 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/script/dom/paintworkletglobalscope.rs
View file

@ -46,7 +46,6 @@ use js::rust::Runtime;
use msg::constellation_msg::PipelineId;
use net_traits::image::base::PixelFormat;
use net_traits::image_cache::ImageCache;
use script_layout_interface::message::Msg;
use script_traits::DrawAPaintImageResult;
use script_traits::Painter;
use servo_atoms::Atom;
@ -443,8 +442,7 @@ impl PaintWorkletGlobalScopeMethods for PaintWorkletGlobalScope {
// Inform layout that there is a registered paint worklet.
// TODO: layout will end up getting this message multiple times.
let painter = self.painter(name.clone());
let msg = Msg::RegisterPaint(name, properties, painter);
self.worklet_global.send_to_layout(msg);
self.worklet_global.register_paint_worklet(name, properties, painter);
Ok(())
}

44
components/script/dom/workletglobalscope.rs
View file

@ -22,12 +22,10 @@ use net_traits::ResourceThreads;
use net_traits::image_cache::ImageCache;
use profile_traits::mem;
use profile_traits::time;
use script_layout_interface::message::Msg;
use script_runtime::ScriptThreadEventCategory;
use script_thread::{MainThreadScriptMsg, ScriptThread, Task};
use script_traits::ScriptMsg;
use script_traits::ScriptToConstellationChan;
use script_traits::TimerSchedulerMsg;
use script_thread::MainThreadScriptMsg;
use script_traits::{Painter, ScriptMsg};
use script_traits::{ScriptToConstellationChan, TimerSchedulerMsg};
use servo_atoms::Atom;
use servo_url::ImmutableOrigin;
use servo_url::MutableOrigin;
use servo_url::ServoUrl;
@ -93,31 +91,23 @@ impl WorkletGlobalScope {
self.globalscope.evaluate_js_on_global_with_result(&*script, rval.handle_mut())
}
/// Run a task in the main script thread.
pub fn run_in_script_thread<T>(&self, task: T)
where
T: 'static + Send + Task,
{
/// Register a paint worklet to the script thread.
pub fn register_paint_worklet(
&self,
name: Atom,
properties: Vec<Atom>,
painter: Box<Painter>,
) {
self.to_script_thread_sender
.send(MainThreadScriptMsg::MainThreadTask(
ScriptThreadEventCategory::WorkletEvent,
box task,
))
.send(MainThreadScriptMsg::RegisterPaintWorklet {
pipeline_id: self.globalscope.pipeline_id(),
name,
properties,
painter,
})
.expect("Worklet thread outlived script thread.");
}
/// Send a message to layout.
pub fn send_to_layout(&self, msg: Msg) {
struct SendToLayoutTask(PipelineId, Msg);
impl Task for SendToLayoutTask {
fn run_with_script_thread(self: Box<Self>, script_thread: &ScriptThread) {
script_thread.send_to_layout(self.0, self.1);
}
}
let pipeline_id = self.globalscope.pipeline_id();
self.run_in_script_thread(SendToLayoutTask(pipeline_id, msg));
}
/// The base URL of this global.
pub fn base_url(&self) -> ServoUrl {
self.base_url.clone()