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

Auto merge of #11521 - Ms2ger:SharedLayoutContext-url, r=nox

Browse source 
Remove SharedLayoutContext::url.

- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes do not require tests because dead code removal

It is unused.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11521)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-05-31 07:52:30 -05:00
commit 963e28a4b6
2 changed files with 0 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/layout/context.rs
View file

@ -91,9 +91,6 @@ pub struct SharedLayoutContext {
/// Interface to the font cache thread.
pub font_cache_thread: Mutex<FontCacheThread>,
/// The URL.
pub url: Url,
/// The visible rects for each layer, as reported to us by the compositor.
pub visible_rects: Arc<HashMap<LayerId, Rect<Au>, BuildHasherDefault<FnvHasher>>>,

7
components/layout/layout_thread.rs
View file

@ -500,7 +500,6 @@ impl LayoutThread {
fn build_shared_layout_context(&self,
rw_data: &LayoutThreadData,
screen_size_changed: bool,
url: &Url,
goal: ReflowGoal)
-> SharedLayoutContext {
SharedLayoutContext {
@ -518,7 +517,6 @@ impl LayoutThread {
image_cache_thread: self.image_cache_thread.clone(),
image_cache_sender: Mutex::new(self.image_cache_sender.clone()),
font_cache_thread: Mutex::new(self.font_cache_thread.clone()),
url: (*url).clone(),
visible_rects: self.visible_rects.clone(),
webrender_image_cache: self.webrender_image_cache.clone(),
}
@ -609,7 +607,6 @@ impl LayoutThread {
};
let mut layout_context = self.build_shared_layout_context(&*rw_data,
false,
&self.url,
reflow_info.goal);
self.perform_post_style_recalc_layout_passes(&reflow_info,
@ -1113,7 +1110,6 @@ impl LayoutThread {
// Create a layout context for use throughout the following passes.
let mut shared_layout_context = self.build_shared_layout_context(&*rw_data,
viewport_size_changed,
&self.url,
data.reflow_info.goal);
if node.is_dirty() || node.has_dirty_descendants() {
@ -1262,7 +1258,6 @@ impl LayoutThread {
let mut layout_context = self.build_shared_layout_context(&*rw_data,
false,
&self.url,
reflow_info.goal);
self.perform_post_main_layout_passes(&reflow_info, &mut *rw_data, &mut layout_context);
@ -1282,7 +1277,6 @@ impl LayoutThread {
let mut layout_context = self.build_shared_layout_context(&*rw_data,
false,
&self.url,
reflow_info.goal);
if let Some(mut root_flow) = self.root_flow.clone() {
@ -1313,7 +1307,6 @@ impl LayoutThread {
let mut layout_context = self.build_shared_layout_context(&*rw_data,
false,
&self.url,
reflow_info.goal);
// No need to do a style recalc here.