aboutsummaryrefslogtreecommitdiffstats
path: root/components/servo
diff options
context:
space:
mode:
authorPatrick Walton <pcwalton@mimiga.net>2016-06-06 19:17:09 -0700
committerPatrick Walton <pcwalton@mimiga.net>2016-06-08 12:29:44 -0700
commit0d963f5bf820f4ee604c2ee059d19e031237a4de (patch)
treea056c5eb2d70d2d153bf4d560d46602374448731 /components/servo
parenta259bb38b10e528c0eb4e9900127bc22a9298784 (diff)
downloadservo-0d963f5bf820f4ee604c2ee059d19e031237a4de.tar.gz
servo-0d963f5bf820f4ee604c2ee059d19e031237a4de.zip
servo: Add an `Info.plist` on the Mac and opt into integrated graphics.
Discrete GPUs cause power use problems and tend to perform badly with WebRender. See: * https://developer.apple.com/library/mac/qa/qa1734/_index.html * https://reverse.put.as/2013/05/28/gimmedebugah-how-to-embedded-a-info-plist-into-arbitrary-binaries/
Diffstat (limited to 'components/servo')
-rw-r--r--components/servo/main.rs13
-rw-r--r--components/servo/platform/macos/Info.plist21
-rw-r--r--components/servo/platform/macos/mod.rs19
3 files changed, 53 insertions, 0 deletions
diff --git a/components/servo/main.rs b/components/servo/main.rs
index 361e0f01a75..4622040fa44 100644
--- a/components/servo/main.rs
+++ b/components/servo/main.rs
@@ -37,6 +37,17 @@ use servo::util::opts::{self, ArgumentParsingResult};
use servo::util::panicking::initiate_panic_hook;
use std::rc::Rc;
+pub mod platform {
+ #[cfg(target_os = "macos")]
+ pub use platform::macos::deinit;
+
+ #[cfg(target_os = "macos")]
+ pub mod macos;
+
+ #[cfg(not(target_os = "macos"))]
+ pub fn deinit() {}
+}
+
fn main() {
// Parse the command line options and store them globally
let opts_result = opts::from_cmdline_args(&*args());
@@ -82,6 +93,8 @@ fn main() {
};
unregister_glutin_resize_handler(&window);
+
+ platform::deinit()
}
fn register_glutin_resize_handler(window: &Rc<app::window::Window>,
diff --git a/components/servo/platform/macos/Info.plist b/components/servo/platform/macos/Info.plist
new file mode 100644
index 00000000000..c2855eb82b4
--- /dev/null
+++ b/components/servo/platform/macos/Info.plist
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>NSSupportsAutomaticGraphicsSwitching</key>
+ <true/>
+ <key>CFBundleDisplayName</key>
+ <string>Servo</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleName</key>
+ <string>Servo</string>
+ <key>NSHumanReadableCopyright</key>
+ <string>Copyright &#169; 2016 The Servo Authors</string>
+ <key>CFBundleVersion</key>
+ <string>0.0.1</string>
+ <key>CFBundleIdentifier</key>
+ <string>org.servo.servo</string>
+</dict>
+</plist>
+
diff --git a/components/servo/platform/macos/mod.rs b/components/servo/platform/macos/mod.rs
new file mode 100644
index 00000000000..b980b83f5fb
--- /dev/null
+++ b/components/servo/platform/macos/mod.rs
@@ -0,0 +1,19 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+use std::ptr;
+
+pub fn deinit() {
+ // An unfortunate hack to make sure the linker's dead code stripping doesn't strip our
+ // `Info.plist`.
+ unsafe {
+ ptr::read_volatile(&INFO_PLIST[0]);
+ }
+}
+
+#[cfg(target_os = "macos")]
+#[link_section = "__TEXT,__info_plist"]
+#[no_mangle]
+pub static INFO_PLIST: [u8; 619] = *include_bytes!("Info.plist");
+