From a825e59516766b242f60155b01ac2c3bedea82ab Mon Sep 17 00:00:00 2001
From: Adenilson Cavalcanti <cavalcantii@gmail.com>
Date: Thu, 5 Feb 2015 16:27:15 -0800
Subject: [PATCH] Using the color helpers in CanvasPaintTask.

---
 components/canvas/Cargo.toml           | 5 ++++-
 components/canvas/canvas_paint_task.rs | 7 ++++---
 components/canvas/lib.rs               | 2 ++
 components/servo/Cargo.lock            | 1 +
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml
index 8aba12c4b4b..b00687e3ca4 100644
--- a/components/canvas/Cargo.toml
+++ b/components/canvas/Cargo.toml
@@ -14,4 +14,7 @@ git = "https://github.com/servo/rust-azure"
 git = "https://github.com/servo/rust-geom"
 
 [dependencies.util]
-path = "../util"
\ No newline at end of file
+path = "../util"
+
+[dependencies.gfx]
+path = "../gfx"
diff --git a/components/canvas/canvas_paint_task.rs b/components/canvas/canvas_paint_task.rs
index 6552d9e606a..982861b0637 100644
--- a/components/canvas/canvas_paint_task.rs
+++ b/components/canvas/canvas_paint_task.rs
@@ -2,10 +2,11 @@
  * 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 azure::azure_hl::{DrawTarget, Color, SurfaceFormat, BackendType, StrokeOptions, DrawOptions};
+use azure::azure_hl::{DrawTarget, SurfaceFormat, BackendType, StrokeOptions, DrawOptions};
 use azure::azure_hl::{ColorPattern, PatternRef};
 use geom::rect::Rect;
 use geom::size::Size2D;
+use gfx::color;
 use util::task::spawn_named;
 
 use std::borrow::ToOwned;
@@ -32,8 +33,8 @@ impl CanvasPaintTask {
     fn new(size: Size2D<i32>) -> CanvasPaintTask {
         CanvasPaintTask {
             drawtarget: CanvasPaintTask::create(size),
-            fill_color: ColorPattern::new(Color::new(0., 0., 0., 1.)),
-            stroke_color: ColorPattern::new(Color::new(0., 0., 0., 1.)),
+            fill_color: ColorPattern::new(color::black()),
+            stroke_color: ColorPattern::new(color::black()),
             stroke_opts: StrokeOptions::new(1.0, 1.0),
         }
     }
diff --git a/components/canvas/lib.rs b/components/canvas/lib.rs
index 1d2decb1690..9e91a2d6bf5 100644
--- a/components/canvas/lib.rs
+++ b/components/canvas/lib.rs
@@ -9,6 +9,8 @@
 
 extern crate azure;
 extern crate geom;
+extern crate gfx;
 extern crate util;
 
+
 pub mod canvas_paint_task;
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index f252c7b12df..51f41bda4b2 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -53,6 +53,7 @@ version = "0.0.1"
 dependencies = [
  "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
  "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
+ "gfx 0.0.1",
  "util 0.0.1",
 ]