Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Take LayoutThread::url out of its RefCell.

Browse source
This commit is contained in:
Ms2ger 2016-05-25 09:25:07 +02:00
parent 220bdfec2e
commit 2d9248dc36
1 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

25
components/layout/layout_thread.rs
View file

@ -58,7 +58,6 @@ use script_traits::{LayoutControlMsg, LayoutMsg as ConstellationMsg, OpaqueScrip
use sequential; use sequential;
use serde_json; use serde_json;
use std::borrow::ToOwned; use std::borrow::ToOwned;
use std::cell::RefCell;
use std::collections::HashMap; use std::collections::HashMap;
use std::hash::BuildHasherDefault; use std::hash::BuildHasherDefault;
use std::ops::{Deref, DerefMut}; use std::ops::{Deref, DerefMut};
@ -144,7 +143,7 @@ pub struct LayoutThread {
id: PipelineId, id: PipelineId,
/// The URL of the pipeline that we belong to. /// The URL of the pipeline that we belong to.
url: RefCell<Url>, url: Url,
/// Is the current reflow of an iframe, as opposed to a root window? /// Is the current reflow of an iframe, as opposed to a root window?
is_iframe: bool, is_iframe: bool,
@ -430,7 +429,7 @@ impl LayoutThread {
LayoutThread { LayoutThread {
id: id, id: id,
url: RefCell::new(url), url: url,
is_iframe: is_iframe, is_iframe: is_iframe,
port: port, port: port,
pipeline_port: pipeline_receiver, pipeline_port: pipeline_receiver,
@ -609,7 +608,7 @@ impl LayoutThread {
}; };
let mut layout_context = self.build_shared_layout_context(&*rw_data, let mut layout_context = self.build_shared_layout_context(&*rw_data,
false, false,
&self.url.borrow(), &self.url,
reflow_info.goal); reflow_info.goal);
self.perform_post_style_recalc_layout_passes(&reflow_info, self.perform_post_style_recalc_layout_passes(&reflow_info,
@ -668,7 +667,7 @@ impl LayoutThread {
self.create_layout_thread(info) self.create_layout_thread(info)
} }
Msg::SetFinalUrl(final_url) => { Msg::SetFinalUrl(final_url) => {
*self.url.borrow_mut() = final_url; self.url = final_url;
}, },
Msg::PrepareToExit(response_chan) => { Msg::PrepareToExit(response_chan) => {
self.prepare_to_exit(response_chan); self.prepare_to_exit(response_chan);
@ -692,7 +691,7 @@ impl LayoutThread {
// FIXME(njn): Just measuring the display tree for now. // FIXME(njn): Just measuring the display tree for now.
let rw_data = possibly_locked_rw_data.lock(); let rw_data = possibly_locked_rw_data.lock();
let display_list = rw_data.display_list.as_ref(); let display_list = rw_data.display_list.as_ref();
let formatted_url = &format!("url({})", *self.url.borrow()); let formatted_url = &format!("url({})", self.url);
reports.push(Report { reports.push(Report {
path: path![formatted_url, "layout-thread", "display-list"], path: path![formatted_url, "layout-thread", "display-list"],
kind: ReportKind::ExplicitJemallocHeapSize, kind: ReportKind::ExplicitJemallocHeapSize,
@ -998,7 +997,7 @@ impl LayoutThread {
let document = unsafe { ServoLayoutNode::new(&data.document) }; let document = unsafe { ServoLayoutNode::new(&data.document) };
let document = document.as_document().unwrap(); let document = document.as_document().unwrap();
debug!("layout: received layout request for: {}", *self.url.borrow()); debug!("layout: received layout request for: {}", self.url);
let mut rw_data = possibly_locked_rw_data.lock(); let mut rw_data = possibly_locked_rw_data.lock();
@ -1044,7 +1043,7 @@ impl LayoutThread {
Some(x) => x, Some(x) => x,
}; };
debug!("layout: received layout request for: {}", *self.url.borrow()); debug!("layout: received layout request for: {}", self.url);
if log_enabled!(log::LogLevel::Debug) { if log_enabled!(log::LogLevel::Debug) {
node.dump(); node.dump();
} }
@ -1113,7 +1112,7 @@ impl LayoutThread {
// Create a layout context for use throughout the following passes. // Create a layout context for use throughout the following passes.
let mut shared_layout_context = self.build_shared_layout_context(&*rw_data, let mut shared_layout_context = self.build_shared_layout_context(&*rw_data,
viewport_size_changed, viewport_size_changed,
&self.url.borrow(), &self.url,
data.reflow_info.goal); data.reflow_info.goal);
if node.is_dirty() || node.has_dirty_descendants() { if node.is_dirty() || node.has_dirty_descendants() {
@ -1262,7 +1261,7 @@ impl LayoutThread {
let mut layout_context = self.build_shared_layout_context(&*rw_data, let mut layout_context = self.build_shared_layout_context(&*rw_data,
false, false,
&self.url.borrow(), &self.url,
reflow_info.goal); reflow_info.goal);
self.perform_post_main_layout_passes(&reflow_info, &mut *rw_data, &mut layout_context); self.perform_post_main_layout_passes(&reflow_info, &mut *rw_data, &mut layout_context);
@ -1282,7 +1281,7 @@ impl LayoutThread {
let mut layout_context = self.build_shared_layout_context(&*rw_data, let mut layout_context = self.build_shared_layout_context(&*rw_data,
false, false,
&self.url.borrow(), &self.url,
reflow_info.goal); reflow_info.goal);
if let Some(mut root_flow) = self.root_flow.clone() { if let Some(mut root_flow) = self.root_flow.clone() {
@ -1313,7 +1312,7 @@ impl LayoutThread {
let mut layout_context = self.build_shared_layout_context(&*rw_data, let mut layout_context = self.build_shared_layout_context(&*rw_data,
false, false,
&self.url.borrow(), &self.url,
reflow_info.goal); reflow_info.goal);
// No need to do a style recalc here. // No need to do a style recalc here.
@ -1458,7 +1457,7 @@ impl LayoutThread {
/// Returns profiling information which is passed to the time profiler. /// Returns profiling information which is passed to the time profiler.
fn profiler_metadata(&self) -> Option<TimerMetadata> { fn profiler_metadata(&self) -> Option<TimerMetadata> {
Some(TimerMetadata { Some(TimerMetadata {
url: self.url.borrow().to_string(), url: self.url.to_string(),
iframe: if self.is_iframe { iframe: if self.is_iframe {
TimerMetadataFrameType::IFrame TimerMetadataFrameType::IFrame
} else { } else {