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

Fix build errors after rebasing and address review comments

Browse source
This commit is contained in:
Keith Yeung 2015-12-09 02:25:13 -08:00
parent 8cdafe8ffc
commit 2ee446de5d
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
components/layout/layout_task.rs
View file

@ -54,7 +54,7 @@ use script_traits::{ConstellationControlMsg, LayoutControlMsg, OpaqueScriptLayou
use sequential;
use serde_json;
use std::borrow::ToOwned;
use std::cell::{Cell, RefCell};
use std::cell::RefCell;
use std::collections::HashMap;
use std::collections::hash_state::DefaultState;
use std::mem::transmute;
@ -627,8 +627,7 @@ impl LayoutTask {
self.create_layout_task(info)
}
Msg::SetFinalUrl(final_url) => {
let mut url_ref_cell = self.url.borrow_mut();
*url_ref_cell = final_url;
*self.url.borrow_mut() = final_url;
},
Msg::PrepareToExit(response_chan) => {
self.prepare_to_exit(response_chan);
@ -918,7 +917,7 @@ impl LayoutTask {
let document = unsafe { ServoLayoutNode::new(&data.document) };
let document = document.as_document().unwrap();
debug!("layout: received layout request for: {}", self.url.serialize());
debug!("layout: received layout request for: {}", self.url.borrow().serialize());
let mut rw_data = possibly_locked_rw_data.lock();
@ -1128,7 +1127,7 @@ impl LayoutTask {
let mut layout_context = self.build_shared_layout_context(&*rw_data,
false,
url_clone,
&self.url.borrow(),
reflow_info.goal);
self.perform_post_main_layout_passes(&reflow_info, &mut *rw_data, &mut layout_context);
@ -1183,7 +1182,7 @@ impl LayoutTask {
let mut layout_context = self.build_shared_layout_context(&*rw_data,
false,
&self.url,
&self.url.borrow(),
reflow_info.goal);
// No need to do a style recalc here.
@ -1307,7 +1306,7 @@ impl LayoutTask {
/// Returns profiling information which is passed to the time profiler.
fn profiler_metadata(&self) -> Option<TimerMetadata> {
Some(TimerMetadata {
url: self.url.serialize(),
url: self.url.borrow().serialize(),
iframe: if self.is_iframe {
TimerMetadataFrameType::IFrame
} else {