Bug 1587084 - Restore the picture caching enabled preference. r=nical
authorGlenn Watson <git@intuitionlibrary.com>
Wed, 09 Oct 2019 08:07:36 +0000
changeset 496923 29ecd1185d1cd5cc87c835fb7666d095b9368ca2
parent 496922 7c6cde9fc234a11abb7df32be1be547afd32a6ae
child 496924 68dee1ec153d988611cc66113a72513358d4b58e
push id114147
push userccoroiu@mozilla.com
push dateThu, 10 Oct 2019 09:56:56 +0000
treeherdermozilla-inbound@484a51c401ef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnical
bugs1587084
milestone71.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1587084 - Restore the picture caching enabled preference. r=nical The previous patch fixed the bug in the non-picture caching code path, so we can re-enable the preference now. Differential Revision: https://phabricator.services.mozilla.com/D48639
gfx/webrender_bindings/src/bindings.rs
--- a/gfx/webrender_bindings/src/bindings.rs
+++ b/gfx/webrender_bindings/src/bindings.rs
@@ -1198,20 +1198,16 @@ pub extern "C" fn wr_window_new(window_i
 
     let color = if cfg!(target_os = "android") {
         // The color is for avoiding black flash before receiving display list.
         ColorF::new(1.0, 1.0, 1.0, 1.0)
     } else {
         ColorF::new(0.0, 0.0, 0.0, 0.0)
     };
 
-    if !enable_picture_caching {
-        info!("WebRender - picture-caching cannot be disabled until bug 1587084 is resolved.");
-    }
-
     let opts = RendererOptions {
         enable_aa: true,
         enable_subpixel_aa: cfg!(not(target_os = "android")),
         support_low_priority_transactions,
         allow_texture_swizzling,
         recorder: recorder,
         blob_image_handler: Some(Box::new(Moz2dBlobImageHandler::new(workers.clone()))),
         workers: Some(workers.clone()),
@@ -1233,17 +1229,17 @@ pub extern "C" fn wr_window_new(window_i
         renderer_id: Some(window_id.0),
         upload_method,
         scene_builder_hooks: Some(Box::new(APZCallbacks::new(window_id))),
         sampler: Some(Box::new(SamplerCallback::new(window_id))),
         max_texture_size: Some(8192), // Moz2D doesn't like textures bigger than this
         clear_color: Some(color),
         precache_flags,
         namespace_alloc_by_client: true,
-        enable_picture_caching: true,
+        enable_picture_caching,
         allow_pixel_local_storage_support: false,
         start_debug_server,
         ..Default::default()
     };
 
     // Ensure the WR profiler callbacks are hooked up to the Gecko profiler.
     set_profiler_hooks(Some(&PROFILER_HOOKS));