From 17ee21bf9d4200ea53d5a924c139f6c9add8b2b7 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Thu, 10 Jan 2019 14:05:36 +0100 Subject: [PATCH] Rename NewLayoutThreadInfo to LayoutThreadInit Following the convention of our other init structs. --- components/layout_thread/lib.rs | 4 ++-- components/script/script_thread.rs | 4 ++-- components/script_layout_interface/message.rs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/layout_thread/lib.rs b/components/layout_thread/lib.rs index b60838365de..47774b86ec3 100644 --- a/components/layout_thread/lib.rs +++ b/components/layout_thread/lib.rs @@ -75,7 +75,7 @@ use parking_lot::RwLock; use profile_traits::mem::{self as profile_mem, Report, ReportKind, ReportsChan}; use profile_traits::time::{self as profile_time, profile, TimerMetadata}; use profile_traits::time::{TimerMetadataFrameType, TimerMetadataReflowType}; -use script_layout_interface::message::{Msg, NewLayoutThreadInfo, NodesFromPointQueryType, Reflow}; +use script_layout_interface::message::{Msg, LayoutThreadInit, NodesFromPointQueryType, Reflow}; use script_layout_interface::message::{QueryMsg, ReflowComplete, ReflowGoal, ScriptReflow}; use script_layout_interface::rpc::TextIndexResponse; use script_layout_interface::rpc::{LayoutRPC, OffsetParentResponse, StyleResponse}; @@ -842,7 +842,7 @@ impl LayoutThread { reports_chan.send(reports); } - fn create_layout_thread(&self, info: NewLayoutThreadInfo) { + fn create_layout_thread(&self, info: LayoutThreadInit) { LayoutThread::create( info.id, self.top_level_browsing_context_id, diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index 9247ca6afba..fd08bb5f80c 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -118,7 +118,7 @@ use net_traits::{ }; use profile_traits::mem::{self as profile_mem, OpaqueSender, ReportsChan}; use profile_traits::time::{self as profile_time, profile, ProfilerCategory}; -use script_layout_interface::message::{self, Msg, NewLayoutThreadInfo, ReflowGoal}; +use script_layout_interface::message::{self, Msg, LayoutThreadInit, ReflowGoal}; use script_traits::webdriver_msg::WebDriverScriptCommand; use script_traits::CompositorEvent::{ CompositionEvent, KeyboardEvent, MouseButtonEvent, MouseMoveEvent, ResizeEvent, TouchEvent, @@ -1936,7 +1936,7 @@ impl ScriptThread { let layout_pair = unbounded(); let layout_chan = layout_pair.0.clone(); - let msg = message::Msg::CreateLayoutThread(NewLayoutThreadInfo { + let msg = message::Msg::CreateLayoutThread(LayoutThreadInit { id: new_pipeline_id, url: load_data.url.clone(), is_parent: false, diff --git a/components/script_layout_interface/message.rs b/components/script_layout_interface/message.rs index b7415d88cdc..2d92cfb157c 100644 --- a/components/script_layout_interface/message.rs +++ b/components/script_layout_interface/message.rs @@ -82,7 +82,7 @@ pub enum Msg { /// Creates a new layout thread. /// /// This basically exists to keep the script-layout dependency one-way. - CreateLayoutThread(NewLayoutThreadInfo), + CreateLayoutThread(LayoutThreadInit), /// Set the final Url. SetFinalUrl(ServoUrl), @@ -214,7 +214,7 @@ pub struct ScriptReflow { pub dom_count: u32, } -pub struct NewLayoutThreadInfo { +pub struct LayoutThreadInit { pub id: PipelineId, pub url: ServoUrl, pub is_parent: bool,