Merge branch 'servo:master' into master

1 files changed, 5 insertions, 44 deletions

diff --git a/components/servo/lib.rs b/components/servo/lib.rs
index 434ebe5b33e..25d89187f0c 100644
--- a/components/servo/lib.rs
+++ b/components/servo/lib.rs
@@ -141,49 +141,14 @@ mod media_platform {
     use super::ServoMedia;
     use servo_media_gstreamer::GStreamerBackend;
 
-    #[cfg(feature = "uwp")]
-    fn set_gstreamer_log_handler() {
-        use gstreamer::{debug_add_log_function, DebugLevel};
-
-        debug_add_log_function(|cat, level, file, function, line, _, message| {
-            let message = format!(
-                "{:?} {:?} {:?}:{:?}:{:?} {:?}",
-                cat.get_name(),
-                level,
-                file,
-                line,
-                function,
-                message
-            );
-            match level {
-                DebugLevel::Debug => debug!("{}", message),
-                DebugLevel::Error => error!("{}", message),
-                DebugLevel::Warning => warn!("{}", message),
-                DebugLevel::Fixme | DebugLevel::Info => info!("{}", message),
-                DebugLevel::Memdump | DebugLevel::Count | DebugLevel::Trace => {
-                    trace!("{}", message)
-                },
-                _ => (),
-            }
-        });
-    }
-
     #[cfg(any(windows, target_os = "macos"))]
     pub fn init() {
-        // UWP apps have the working directory set appropriately. Win32 apps
-        // do not and need some assistance finding the DLLs.
-        let plugin_dir = if cfg!(feature = "uwp") {
-            std::path::PathBuf::new()
-        } else {
-            let mut plugin_dir = std::env::current_exe().unwrap();
-            plugin_dir.pop();
+        let mut plugin_dir = std::env::current_exe().unwrap();
+        plugin_dir.pop();
 
-            if cfg!(target_os = "macos") {
-                plugin_dir.push("lib");
-            }
-
-            plugin_dir
-        };
+        if cfg!(target_os = "macos") {
+            plugin_dir.push("lib");
+        }
 
         let backend = match GStreamerBackend::init_with_plugins(
             plugin_dir,
@@ -196,10 +161,6 @@ mod media_platform {
             },
         };
         ServoMedia::init_with_backend(backend);
-        #[cfg(feature = "uwp")]
-        {
-            set_gstreamer_log_handler();
-        }
     }
 
     #[cfg(not(any(windows, target_os = "macos")))]