Skip to content

Commit fe30c0f

Browse files
atouchetskrzyp1
authored andcommitted
Rename glutin port to winit
1 parent fa5aa5c commit fe30c0f

24 files changed

+12
-13
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[workspace]
22
members = [
3-
"ports/glutin",
3+
"ports/winit",
44
"ports/gstplugin",
55
"ports/libsimpleservo/capi/",
66
"ports/libsimpleservo/jniapi/",

docs/HACKING_QUICKSTART.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ See [Cargo's documentation about Cargo.toml and Cargo.lock files](https://doc.ru
102102

103103
As explained above, Servo depends on a lot of libraries, which makes it very modular. While working on a bug in Servo, you'll often end up in one of its dependencies. You will then want to compile your own version of the dependency (and maybe compiling against the HEAD of the library will fix the issue!).
104104

105-
For example, I'm trying to bring some cocoa events to Servo. The Servo window on Desktop is constructed with a library named [Glutin](https://github.com/tomaka/glutin). Glutin itself depends on a cocoa library named [cocoa-rs](https://github.com/servo/cocoa-rs). When building Servo, magically, all these dependencies are downloaded and built for you. But because I want to work on this cocoa event feature, I want Servo to use my own version of *glutin* and *cocoa-rs*.
105+
For example, I'm trying to bring some cocoa events to Servo. The Servo window on Desktop is constructed with a library named [winit](https://github.com/rust-windowing/winit). winit itself depends on a cocoa library named [cocoa-rs](https://github.com/servo/cocoa-rs). When building Servo, magically, all these dependencies are downloaded and built for you. But because I want to work on this cocoa event feature, I want Servo to use my own version of *winit* and *cocoa-rs*.
106106

107107
This is how my projects are laid out:
108108

docs/ORGANIZATION.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
* mach
6464
* A command-line tool to help with developer tasks.
6565
* ports
66-
* glutin
66+
* winit
6767
* Embedding implementation for the `winit` windowing library.
6868
* python
6969
* servo

etc/ci/check_no_panic.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ cd "$(git rev-parse --show-toplevel)"
1717
PATHS=(
1818
"components/compositing/compositor.rs"
1919
"components/constellation/"
20-
"ports/glutin/headed_window.rs"
21-
"ports/glutin/headless_window.rs"
22-
"ports/glutin/embedder.rs"
20+
"ports/winit/headed_window.rs"
21+
"ports/winit/headless_window.rs"
22+
"ports/winit/embedder.rs"
2323
)
2424

2525
# Make sure the paths exist

ports/gstplugin/resources.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* License, v. 2.0. If a copy of the MPL was not distributed with this
33
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
44

5-
// This is a copy of the resource loader from the glutin port
5+
// This is a copy of the resource loader from the winit port
66
// TODO: move this to somewhere where it can be shared.
77
// https://github.com/servo/servo/issues/24853
88

File renamed without changes.
File renamed without changes.
File renamed without changes.

ports/glutin/browser.rs renamed to ports/winit/browser.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ where
513513
},
514514
EmbedderMsg::MediaSessionEvent(_) => {
515515
debug!("MediaSessionEvent received");
516-
// TODO(ferjm): MediaSession support for Glutin based browsers.
516+
// TODO(ferjm): MediaSession support for winit based browsers.
517517
},
518518
EmbedderMsg::OnDevtoolsStarted(port) => {
519519
match port {
File renamed without changes.

0 commit comments

Comments
 (0)