Rename webrender_traits into webrender_api, reexport in webrender.

.travis.yml

@@ -24,7 +24,7 @@ before_install:
   - pip install mako servo-tidy
 script:
   - servo-tidy
-  - if [ $BUILD_KIND = DEBUG ]; then (cd webrender_traits && cargo test --verbose --features "ipc"); fi
+  - if [ $BUILD_KIND = DEBUG ]; then (cd webrender_api && cargo test --verbose --features "ipc"); fi
   - if [ $BUILD_KIND = DEBUG ]; then (cd webrender && cargo build --verbose --no-default-features); fi
   - if [ $BUILD_KIND = DEBUG ]; then (cargo test --all --verbose); fi
   - if [ $BUILD_KIND = RELEASE ]; then (cd wrench && python headless.py --subpixel-aa reftest); fi

Cargo.toml

@@ -1,7 +1,7 @@
 [workspace]
 members = [
     "webrender",
-    "webrender_traits",
+    "webrender_api",
     "wrench",
 ]
 

README.md

@@ -17,10 +17,10 @@ To use a custom WebRender with servo, go to your servo build directory and:
 ```
 [replace]
 "https://github.com/servo/webrender#0.36.0" = { path = 'Path/To/webrender/webrender/' }
-"https://github.com/servo/webrender#webrender_traits:0.36.0" = { path = 'Path/To/webrender/webrender_traits' }
+"https://github.com/servo/webrender#webrender_api:0.36.0" = { path = 'Path/To/webrender/webrender_api' }
 ```
 
-The exact replace references can be obtained with `cargo pkgid webrender`/`cargo pkgid webrender_traits` command.
+The exact replace references can be obtained with `cargo pkgid webrender`/`cargo pkgid webrender_api` command.
 
   * Build as normal
 

appveyor.yml

@@ -12,7 +12,7 @@ install:
 build: false
 
 test_script:
-  - cd webrender_traits
+  - cd webrender_api
   - cargo test --verbose
   - cd ../webrender
   - cargo test --verbose

webrender/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "webrender"
-version = "0.44.0"
+version = "0.45.0"
 authors = ["Glenn Watson <gw@intuitionlibrary.com>"]
 license = "MPL-2.0"
 repository = "https://github.com/servo/webrender"
@@ -10,7 +10,7 @@ build = "build.rs"
 default = ["freetype-lib", "webgl"]
 freetype-lib = ["freetype/servo-freetype-sys"]
 profiler = ["thread_profiler/thread_profiler"]
-webgl = ["offscreen_gl_context", "webrender_traits/webgl"]
+webgl = ["offscreen_gl_context", "webrender_api/webgl"]
 
 [dependencies]
 app_units = "0.5"
@@ -26,7 +26,7 @@ num-traits = "0.1.32"
 offscreen_gl_context = {version = "0.11", features = ["serde", "osmesa"], optional = true}
 time = "0.1"
 rayon = "0.8"
-webrender_traits = {path = "../webrender_traits"}
+webrender_api = {path = "../webrender_api"}
 bitflags = "0.7"
 gamma-lut = "0.2"
 thread_profiler = "0.1.1"

webrender/benches/coalesce.rs

@@ -3,12 +3,11 @@
 extern crate rand;
 extern crate test;
 extern crate webrender;
-extern crate webrender_traits;
 
 use rand::Rng;
 use test::Bencher;
 use webrender::TexturePage;
-use webrender_traits::{DeviceUintSize as Size};
+use webrender::api::{DeviceUintSize as Size};
 
 #[bench]
 fn bench_coalesce(b: &mut Bencher) {

webrender/examples/animation.rs

@@ -5,7 +5,6 @@
 extern crate gleam;
 extern crate glutin;
 extern crate webrender;
-extern crate webrender_traits;
 
 #[macro_use]
 extern crate lazy_static;
@@ -15,7 +14,7 @@ mod boilerplate;
 
 use boilerplate::HandyDandyRectBuilder;
 use std::sync::Mutex;
-use webrender_traits::*;
+use webrender::api::*;
 
 // This example creates a 100x100 white rect and allows the user to move it
 // around by using the arrow keys. It does this by using the animation API.
@@ -28,12 +27,12 @@ fn body(_api: &RenderApi,
     // Note the magic "42" we use as the animation key. That is used to update
     // the transform in the keyboard event handler code.
     let bounds = (0,0).to(100, 100);
-    builder.push_stacking_context(webrender_traits::ScrollPolicy::Scrollable,
+    builder.push_stacking_context(ScrollPolicy::Scrollable,
                                   bounds,
                                   Some(PropertyBinding::Binding(PropertyBindingKey::new(42))),
                                   TransformStyle::Flat,
                                   None,
-                                  webrender_traits::MixBlendMode::Normal,
+                                  MixBlendMode::Normal,
                                   Vec::new());
 
     // Fill it with a white rect

webrender/examples/basic.rs

@@ -7,7 +7,6 @@ extern crate euclid;
 extern crate gleam;
 extern crate glutin;
 extern crate webrender;
-extern crate webrender_traits;
 
 #[macro_use]
 extern crate lazy_static;
@@ -23,7 +22,7 @@ use std::collections::HashMap;
 use std::fs::File;
 use std::io::Read;
 use std::sync::Mutex;
-use webrender_traits::*;
+use webrender::api::*;
 
 #[derive(Debug)]
 enum Gesture {