mirror of
https://github.com/servo/servo.git
synced 2025-08-03 20:50:07 +01:00
auto merge of #4751 : Ms2ger/servo/shadowing-layout, r=jdm
This commit is contained in:
commit
0f81e70882
3 changed files with 6 additions and 6 deletions
|
@ -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,
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue