diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-04-29 10:45:29 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-29 10:45:29 -0400 |
commit | a9f7b132303f7c02648043df5ebdc25726bd3f88 (patch) | |
tree | eee887c8856ce5a5973e2b1650c6a9bccb7bebe6 /python/servo/command_base.py | |
parent | 799490a02e9bea575bf34c39f045ef0883539f05 (diff) | |
parent | 21ed7653f491d9e378aa7a334b40e7327f4bfc90 (diff) | |
download | servo-a9f7b132303f7c02648043df5ebdc25726bd3f88.tar.gz servo-a9f7b132303f7c02648043df5ebdc25726bd3f88.zip |
Auto merge of #23233 - paulrouget:glutin-port-refactoring, r=jdm
Glutin port refactoring
Glutin port refactoring in preparation for the compositor and libservo refactoring.
In theory, the only behavior change is for headless mode. The headless event loop now uses winit's event loop (but still headless).
Notes:
- headless and glutin window implementations are now separated
- I split the methods of the embedder in 2: window specific and general methods. In the future, we still want the app to run even without a window or with multiple windows
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23233)
<!-- Reviewable:end -->
Diffstat (limited to 'python/servo/command_base.py')
-rw-r--r-- | python/servo/command_base.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 2d159df3773..ac9789ca389 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -723,20 +723,20 @@ install them, let us know by filing a bug!") return env - def ports_servo_crate(self): - return path.join(self.context.topdir, "ports", "servo") + def ports_glutin_crate(self): + return path.join(self.context.topdir, "ports", "glutin") def add_manifest_path(self, args, android=False, libsimpleservo=False): if "--manifest-path" not in args: if libsimpleservo or android: manifest = self.ports_libsimpleservo_manifest(android) else: - manifest = self.ports_servo_manifest() + manifest = self.ports_glutin_manifest() args.append("--manifest-path") args.append(manifest) - def ports_servo_manifest(self): - return path.join(self.context.topdir, "ports", "servo", "Cargo.toml") + def ports_glutin_manifest(self): + return path.join(self.context.topdir, "ports", "glutin", "Cargo.toml") def ports_libsimpleservo_manifest(self, android=False): if android: |