Skip to content

Commit 6aa2c06

Browse files
committed
Bug 1512156 - Update webrender to commit 8a6a53883bc6fe9522730e09b916f4023ee10d51 (WR PR #3387). r=kats
servo/webrender#3387 Differential Revision: https://phabricator.services.mozilla.com/D13893 UltraBlame original commit: ea5869ddc7dc02086e3c36e48af7b9e8a26678ca
1 parent 16732f4 commit 6aa2c06

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7c4162c581978d1a72ed2271a94382290855e227
1+
8a6a53883bc6fe9522730e09b916f4023ee10d51

gfx/wr/webrender/src/render_backend.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1110,10 +1110,10 @@ impl RenderBackend {
11101110
txn.blob_rasterizer = blob_rasterizer;
11111111
}
11121112

1113-
if !transaction_msg.use_scene_builder_thread && txn.can_skip_scene_builder() {
1114-
if let Some(rasterizer) = txn.blob_rasterizer.take() {
1115-
self.resource_cache.set_blob_rasterizer(rasterizer);
1116-
}
1113+
if !transaction_msg.use_scene_builder_thread &&
1114+
txn.can_skip_scene_builder() &&
1115+
txn.blob_rasterizer.is_none() {
1116+
11171117
self.update_document(
11181118
txn.document_id,
11191119
replace(&mut txn.resource_updates, Vec::new()),

gfx/wr/webrender/src/resource_cache.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1082,7 +1082,7 @@ impl ResourceCache {
10821082
&mut self,
10831083
keys: &[BlobImageKey]
10841084
) -> (Option<Box<AsyncBlobImageRasterizer>>, Vec<BlobImageParams>) {
1085-
if self.blob_image_handler.is_none() {
1085+
if self.blob_image_handler.is_none() || keys.is_empty() {
10861086
return (None, Vec::new());
10871087
}
10881088

0 commit comments

Comments
 (0)