diff options
author | bors-servo <infra@servo.org> | 2023-07-05 17:12:48 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-05 17:12:48 +0200 |
commit | f11c6045e33a921f03223c313781586189309bd2 (patch) | |
tree | 3ba49043d572dee4cafcd3064865026ff496fb96 /components/servo/lib.rs | |
parent | eebb0a57468f20ec9e57e842ba1fc4a0d6c6598e (diff) | |
parent | c58d74fe62ce1b82f2d5a193f4f02bb20a7c402e (diff) | |
download | servo-f11c6045e33a921f03223c313781586189309bd2.tar.gz servo-f11c6045e33a921f03223c313781586189309bd2.zip |
Auto merge of #29970 - mrobinson:remove-uwp, r=jdm
Remove UWP / Hololens support
<!-- Please describe your changes on the following line: -->
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes do not require tests because they remove a feature.
<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
Diffstat (limited to 'components/servo/lib.rs')
-rw-r--r-- | components/servo/lib.rs | 49 |
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")))] |