зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1513852 - Update webrender to commit d983969265589de30dc69b755ca8b3db66bff435 (WR PR #3410). r=kats
https://github.com/servo/webrender/pull/3410 Differential Revision: https://phabricator.services.mozilla.com/D14483 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
73397da5ba
Коммит
5ed5fe9b9b
|
@ -1 +1 @@
|
|||
6bf4830c0b9158245e436f8d5dc08970d1a90fe9
|
||||
d983969265589de30dc69b755ca8b3db66bff435
|
||||
|
|
|
@ -213,6 +213,13 @@ struct CachedImageInfo {
|
|||
manual_eviction: bool,
|
||||
}
|
||||
|
||||
impl CachedImageInfo {
|
||||
fn mark_unused(&mut self, texture_cache: &mut TextureCache) {
|
||||
texture_cache.mark_unused(&self.texture_cache_handle);
|
||||
self.manual_eviction = false;
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(debug_assertions)]
|
||||
impl Drop for CachedImageInfo {
|
||||
fn drop(&mut self) {
|
||||
|
@ -354,13 +361,11 @@ impl ImageResult {
|
|||
fn drop_from_cache(&mut self, texture_cache: &mut TextureCache) {
|
||||
match *self {
|
||||
ImageResult::UntiledAuto(ref mut entry) => {
|
||||
texture_cache.mark_unused(&entry.texture_cache_handle);
|
||||
entry.manual_eviction = false;
|
||||
entry.mark_unused(texture_cache);
|
||||
},
|
||||
ImageResult::Multi(ref mut entries) => {
|
||||
for (_, entry) in &mut entries.resources {
|
||||
texture_cache.mark_unused(&entry.texture_cache_handle);
|
||||
entry.manual_eviction = false;
|
||||
entry.mark_unused(texture_cache);
|
||||
}
|
||||
},
|
||||
ImageResult::Err(_) => {},
|
||||
|
@ -1277,7 +1282,7 @@ impl ResourceCache {
|
|||
if key.tile.is_none() || tile_range.contains(&key.tile.unwrap()) {
|
||||
return true;
|
||||
}
|
||||
texture_cache.mark_unused(&entry.texture_cache_handle);
|
||||
entry.mark_unused(texture_cache);
|
||||
return false;
|
||||
});
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче