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

auto merge of #4751 : Ms2ger/servo/shadowing-layout, r=jdm

Browse source
This commit is contained in:
bors-servo 2015-01-28 06:51:53 -07:00
commit 0f81e70882
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/layout/construct.rs
View file

@ -222,8 +222,8 @@ pub struct FlowConstructor<'a> {
impl<'a> FlowConstructor<'a> {
/// Creates a new flow constructor.
pub fn new<'a>(layout_context: &'a LayoutContext<'a>)
-> FlowConstructor<'a> {
pub fn new<'b>(layout_context: &'b LayoutContext<'b>)
-> FlowConstructor<'b> {
FlowConstructor {
layout_context: layout_context,
}

6
components/layout/context.rs
View file

@ -100,7 +100,7 @@ impl<'a> LayoutContext<'a> {
}
#[inline(always)]
pub fn font_context<'a>(&'a self) -> &'a mut FontContext {
pub fn font_context<'b>(&'b self) -> &'b mut FontContext {
unsafe {
let cached_context = &mut *self.cached_local_layout_context;
&mut cached_context.font_context
@ -108,7 +108,7 @@ impl<'a> LayoutContext<'a> {
}
#[inline(always)]
pub fn applicable_declarations_cache<'a>(&'a self) -> &'a mut ApplicableDeclarationsCache {
pub fn applicable_declarations_cache<'b>(&'b self) -> &'b mut ApplicableDeclarationsCache {
unsafe {
let cached_context = &mut *self.cached_local_layout_context;
&mut cached_context.applicable_declarations_cache
@ -116,7 +116,7 @@ impl<'a> LayoutContext<'a> {
}
#[inline(always)]
pub fn style_sharing_candidate_cache<'a>(&'a self) -> &'a mut StyleSharingCandidateCache {
pub fn style_sharing_candidate_cache<'b>(&'b self) -> &'b mut StyleSharingCandidateCache {
unsafe {
let cached_context = &mut *self.cached_local_layout_context;
&mut cached_context.style_sharing_candidate_cache

2
components/layout/flow_ref.rs
View file

@ -46,7 +46,7 @@ impl<'a> Deref for FlowRef {
}
}
impl<'a> DerefMut for FlowRef {
impl DerefMut for FlowRef {
fn deref_mut<'a>(&mut self) -> &mut (Flow + 'a) {
unsafe {
mem::transmute_copy::<raw::TraitObject, &mut (Flow + 'a)>(&self.object)