From bbed751bbc9613951b733ca58e9fbe82e979c95d Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Mon, 20 Apr 2020 22:05:59 +0200
Subject: [PATCH] Remove use of `webrender::RendererKind`

It appears to be unused since 2017 with https://github.com/servo/webrender/pull/1587
CC https://bugzilla.mozilla.org/show_bug.cgi?id=1631579
---
 components/config/opts.rs | 6 ------
 components/servo/lib.rs   | 9 +--------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/components/config/opts.rs b/components/config/opts.rs
index 36a708b2aba7..c1b05a839715 100644
--- a/components/config/opts.rs
+++ b/components/config/opts.rs
@@ -1009,9 +1009,3 @@ pub fn parse_url_or_filename(cwd: &Path, input: &str) -> Result<ServoUrl, ()> {
         Err(_) => Err(()),
     }
 }
-
-impl Opts {
-    pub fn should_use_osmesa(&self) -> bool {
-        self.headless
-    }
-}
diff --git a/components/servo/lib.rs b/components/servo/lib.rs
index 82ac035fc4c1..15dd2e669dc3 100644
--- a/components/servo/lib.rs
+++ b/components/servo/lib.rs
@@ -118,7 +118,7 @@ use std::rc::Rc;
 use std::sync::atomic::AtomicBool;
 use std::sync::{Arc, Mutex};
 use surfman::GLApi;
-use webrender::{RendererKind, ShaderPrecacheFlags};
+use webrender::ShaderPrecacheFlags;
 use webrender_surfman::WebrenderSurfman;
 use webrender_traits::WebrenderImageHandlerType;
 use webrender_traits::{WebrenderExternalImageHandlers, WebrenderExternalImageRegistry};
@@ -400,12 +400,6 @@ where
         let viewport_size = coordinates.viewport.size.to_f32() / device_pixel_ratio;
 
         let (mut webrender, webrender_api_sender) = {
-            let renderer_kind = if opts::get().should_use_osmesa() {
-                RendererKind::OSMesa
-            } else {
-                RendererKind::Native
-            };
-
             let recorder = if opts.webrender_record {
                 let record_path = PathBuf::from("wr-record.bin");
                 let recorder = Box::new(webrender::BinaryRecorder::new(&record_path));
@@ -436,7 +430,6 @@ where
                     } else {
                         ShaderPrecacheFlags::empty()
                     },
-                    renderer_kind: renderer_kind,
                     enable_subpixel_aa: opts.enable_subpixel_text_antialiasing,
                     allow_texture_swizzling: pref!(gfx.texture_swizzling.enabled),
                     clear_color: None,