Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump euclid to 0.14 #1337

Merged
merged 1 commit into from Jun 10, 2017
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Bump euclid to 0.14

  • Loading branch information
nical committed Jun 8, 2017
commit 8142727add546f199bc4d78ac342a53f85e27a3f

Some generated files are not rendered by default. Learn more.

@@ -17,20 +17,20 @@ app_units = "0.4"
bincode = "1.0.0-alpha6"
bit-set = "0.4"
byteorder = "1.0"
euclid = "0.13"
euclid = "0.14.4"
fnv = "1.0"
gleam = "0.4.3"
lazy_static = "0.2"
log = "0.3"
num-traits = "0.1.32"
offscreen_gl_context = {version = "0.8.0", features = ["serde", "osmesa"], optional = true}
offscreen_gl_context = {version = "0.9.0", features = ["serde", "osmesa"], optional = true}
time = "0.1"
rayon = {version = "0.7", features = ["unstable"]}
webrender_traits = {path = "../webrender_traits"}
bitflags = "0.7"
gamma-lut = "0.2"
thread_profiler = "0.1.1"
plane-split = "0.4"
plane-split = "0.5"

[dev-dependencies]
angle = {git = "https://github.com/servo/angle", branch = "servo"}
@@ -64,7 +64,7 @@ fn event_handler(event: &glutin::Event,
// Update the transform based on the keyboard input and push it to
// webrender using the generate_frame API. This will recomposite with
// the updated transform.
let new_transform = TRANSFORM.lock().unwrap().post_translated(offset.0, offset.1, 0.0);
let new_transform = TRANSFORM.lock().unwrap().post_translate(LayoutVector3D::new(offset.0, offset.1, 0.0));
api.generate_frame(Some(DynamicProperties {
transforms: vec![
PropertyValue {
@@ -21,6 +21,7 @@ use webrender_traits::{ClipRegionToken, ColorF, DisplayListBuilder, Epoch, Glyph
use webrender_traits::{DeviceIntPoint, DeviceUintSize, LayoutPoint, LayoutRect, LayoutSize};
use webrender_traits::{ImageData, ImageDescriptor, ImageFormat};
use webrender_traits::{PipelineId, RenderApi, TransformStyle, BoxShadowClipMode};
use euclid::vec2;

#[derive(Debug)]
enum Gesture {
@@ -381,7 +382,7 @@ fn main() {
let rect = LayoutRect::new(LayoutPoint::new(0.0, 0.0), LayoutSize::new(0.0, 0.0));
let simple_box_bounds = LayoutRect::new(LayoutPoint::new(20.0, 200.0),
LayoutSize::new(50.0, 50.0));
let offset = LayoutPoint::new(10.0, 10.0);
let offset = vec2(10.0, 10.0);
let color = ColorF::new(1.0, 1.0, 1.0, 1.0);
let blur_radius = 0.0;
let spread_radius = 0.0;
@@ -118,7 +118,7 @@ fn event_handler(event: &glutin::Event,
_ => return,
};

api.scroll(ScrollLocation::Delta(LayoutPoint::new(offset.0, offset.1)),
api.scroll(ScrollLocation::Delta(LayoutVector2D::new(offset.0, offset.1)),
*CURSOR_POSITION.lock().unwrap(),
ScrollEventPhase::Start);
}
@@ -136,7 +136,7 @@ fn event_handler(event: &glutin::Event,
glutin::MouseScrollDelta::PixelDelta(dx, dy) => (dx, dy),
};

api.scroll(ScrollLocation::Delta(LayoutPoint::new(dx, dy)),
api.scroll(ScrollLocation::Delta(LayoutVector2D::new(dx, dy)),
*CURSOR_POSITION.lock().unwrap(),
ScrollEventPhase::Start);
}
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.