Move geckolib/properties.mako.rs to style/properties/gecko.mako.rs

ports/geckolib/Cargo.toml

@@ -4,8 +4,6 @@ version = "0.0.1"
 authors = ["The Servo Project Developers"]
 license = "MPL-2.0"
 
-build = "build.rs"
-
 [lib]
 name = "geckoservo"
 path = "lib.rs"

ports/geckolib/build.rs

@@ -1,58 +0,0 @@
-/* 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::env;
-use std::path::Path;
-use std::process::{Command, exit};
-
-#[cfg(windows)]
-fn find_python() -> String {
-    if Command::new("python2.7.exe").arg("--version").output().is_ok() {
-        return "python2.7.exe".to_owned();
-    }
-
-    if Command::new("python27.exe").arg("--version").output().is_ok() {
-        return "python27.exe".to_owned();
-    }
-
-    if Command::new("python.exe").arg("--version").output().is_ok() {
-        return "python.exe".to_owned();
-    }
-
-    panic!(concat!("Can't find python (tried python2.7.exe, python27.exe, and python.exe)! ",
-                   "Try fixing PATH or setting the PYTHON env var"));
-}
-
-#[cfg(not(windows))]
-fn find_python() -> String {
-    if Command::new("python2.7").arg("--version").output().unwrap().status.success() {
-        "python2.7"
-    } else {
-        "python"
-    }.to_owned()
-}
-
-fn main() {
-    let python = env::var("PYTHON").ok().unwrap_or_else(find_python);
-
-    // Mako refuses to load templates outside the scope of the current working directory,
-    // so we need to run it from the top source directory.
-    let geckolib_dir = Path::new(file!()).parent().unwrap();
-    let top_dir = geckolib_dir.join("..").join("..");
-
-    let properties_dir = Path::new("components").join("style").join("properties");
-    println!("cargo:rerun-if-changed={}", top_dir.join(&properties_dir).to_str().unwrap());
-    println!("cargo:rerun-if-changed={}", geckolib_dir.join("properties.mako.rs").to_str().unwrap());
-
-    let status = Command::new(python)
-        .current_dir(&top_dir)
-        .arg(&properties_dir.join("build.py"))
-        .arg("gecko")
-        .arg("geckolib")
-        .status()
-        .unwrap();
-    if !status.success() {
-        exit(1)
-    }
-}

ports/geckolib/glue.rs

@@ -16,8 +16,7 @@ use gecko_bindings::ptr::{GeckoArcPrincipal, GeckoArcURI};
 use gecko_bindings::structs::{SheetParsingMode, nsIAtom};
 use properties::GeckoComputedValues;
 use selector_impl::{GeckoSelectorImpl, PseudoElement, SharedStyleContext, Stylesheet};
-use std::marker::PhantomData;
-use std::mem::{forget, transmute};
+use std::mem::transmute;
 use std::ptr;
 use std::slice;
 use std::str::from_utf8_unchecked;
@@ -26,6 +25,7 @@ use style::arc_ptr_eq;
 use style::context::{LocalStyleContextCreationInfo, ReflowGoal};
 use style::dom::{TDocument, TElement, TNode};
 use style::error_reporting::StdoutErrorReporter;
+use style::gecko_glue::ArcHelpers;
 use style::parallel;
 use style::parser::ParserContextExtraData;
 use style::properties::{ComputedValues, PropertyDeclarationBlock, parse_one_declaration};
@@ -178,54 +178,6 @@ pub extern "C" fn Servo_StylesheetFromUTF8Bytes(bytes: *const u8,
     }
 }
 
-pub struct ArcHelpers<GeckoType, ServoType> {
-    phantom1: PhantomData<GeckoType>,
-    phantom2: PhantomData<ServoType>,
-}
-
-
-impl<GeckoType, ServoType> ArcHelpers<GeckoType, ServoType> {
-    pub fn with<F, Output>(raw: *mut GeckoType, cb: F) -> Output
-                           where F: FnOnce(&Arc<ServoType>) -> Output {
-        debug_assert!(!raw.is_null());
-
-        let owned = unsafe { Self::into(raw) };
-        let result = cb(&owned);
-        forget(owned);
-        result
-    }
-
-    pub fn maybe_with<F, Output>(maybe_raw: *mut GeckoType, cb: F) -> Output
-                                 where F: FnOnce(Option<&Arc<ServoType>>) -> Output {
-        let owned = if maybe_raw.is_null() {
-            None
-        } else {
-            Some(unsafe { Self::into(maybe_raw) })
-        };
-
-        let result = cb(owned.as_ref());
-        forget(owned);
-
-        result
-    }
-
-    pub unsafe fn into(ptr: *mut GeckoType) -> Arc<ServoType> {
-        transmute(ptr)
-    }
-
-    pub fn from(owned: Arc<ServoType>) -> *mut GeckoType {
-        unsafe { transmute(owned) }
-    }
-
-    pub unsafe fn addref(ptr: *mut GeckoType) {
-        Self::with(ptr, |arc| forget(arc.clone()));
-    }
-
-    pub unsafe fn release(ptr: *mut GeckoType) {
-        let _ = Self::into(ptr);
-    }
-}
-
 #[no_mangle]
 pub extern "C" fn Servo_AppendStyleSheet(raw_sheet: *mut RawServoStyleSheet,
                                          raw_data: *mut RawServoStyleSet) {

ports/geckolib/lib.rs

@@ -30,13 +30,7 @@ mod selector_impl;
 mod traversal;
 mod wrapper;
 
-// Generated from the properties.mako.rs template by build.rs
-#[macro_use]
-#[allow(unsafe_code)]
-pub mod properties {
-    include!(concat!(env!("OUT_DIR"), "/properties.rs"));
-}
-
+pub use style::gecko_properties as properties;
 pub use style::gecko_values as values;
 
 // FIXME(bholley): This should probably go away once we harmonize the allocators.