Replacing C libraries with Rust equivalents - student project

components/gfx/Cargo.toml

@@ -47,8 +47,9 @@ git = "https://github.com/servo/rust-harfbuzz"
 [dependencies.fontconfig]
 git = "https://github.com/servo/rust-fontconfig"
 
-[dependencies.freetype]
-git = "https://github.com/servo/rust-freetype"
+[dependencies.freetype-rs]
+git = "https://github.com/PistonDevelopers/freetype-rs"
+ver = "753496406098651c83cdaf63db9f75dc42da17c7"
 
 [dependencies.core_foundation]
 git = "https://github.com/servo/rust-core-foundation"
@@ -61,4 +62,3 @@ git = "https://github.com/servo/rust-core-text"
 
 [dependencies.script_traits]
 path = "../script_traits"
-

components/gfx/display_list/mod.rs

@@ -27,7 +27,7 @@ use libc::uintptr_t;
 use render_task::RenderLayer;
 use script_traits::UntrustedNodeAddress;
 use servo_msg::compositor_msg::LayerId;
-use servo_net::image::base::Image;
+use servo_net::image::base::DynamicImage;
 use servo_util::dlist as servo_dlist;
 use servo_util::geometry::{mod, Au};
 use servo_util::range::Range;
@@ -447,7 +447,7 @@ pub enum TextOrientation {
 #[deriving(Clone)]
 pub struct ImageDisplayItem {
     pub base: BaseDisplayItem,
-    pub image: Arc<Box<Image>>,
+    pub image: Arc<Box<DynamicImage>>,
 
     /// The dimensions to which the image display item should be stretched. If this is smaller than
     /// the bounds of this display item, then the image will be repeated in the appropriate
@@ -553,7 +553,6 @@ impl DisplayItem {
                         bounds.origin.x = bounds.origin.x + x_offset;
                         bounds.origin.y = bounds.origin.y + y_offset;
                         bounds.size = image_item.stretch_size;
-
                         render_context.draw_image(bounds, image_item.image.clone());
 
                         x_offset = x_offset + image_item.stretch_size.width;

components/gfx/lib.rs

@@ -33,6 +33,7 @@ extern crate style;
 extern crate sync;
 extern crate time;
 extern crate url;
+extern crate "image" as servo_image;
 
 // Eventually we would like the shaper to be pluggable, as many operating systems have their own
 // shapers. For now, however, this is a hard dependency.
@@ -43,7 +44,7 @@ extern crate harfbuzz;
 extern crate fontconfig;
 
 #[cfg(any(target_os="linux", target_os = "android"))]
-extern crate freetype;
+extern crate freetype_rs;
 
 // Mac OS-specific library dependencies
 #[cfg(target_os="macos")] extern crate core_foundation;

components/gfx/platform/freetype/font.rs

@@ -2,7 +2,7 @@
  * 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/. */
 
-extern crate freetype;
+extern crate freetype_rs;
 
 use font::{FontHandleMethods, FontMetrics, FontTableMethods};
 use font::{FontTableTag, FractionalPixel};
@@ -14,16 +14,16 @@ use text::util::{float_to_fixed, fixed_to_float};
 use style::computed_values::font_weight;
 use platform::font_template::FontTemplateData;
 
-use freetype::freetype::{FT_Get_Char_Index, FT_Get_Postscript_Name};
-use freetype::freetype::{FT_Load_Glyph, FT_Set_Char_Size};
-use freetype::freetype::{FT_Get_Kerning, FT_Get_Sfnt_Table};
-use freetype::freetype::{FT_New_Memory_Face, FT_Done_Face};
-use freetype::freetype::{FTErrorMethods, FT_F26Dot6, FT_Face, FT_FaceRec};
-use freetype::freetype::{FT_GlyphSlot, FT_Library, FT_Long, FT_ULong};
-use freetype::freetype::{FT_KERNING_DEFAULT, FT_STYLE_FLAG_ITALIC, FT_STYLE_FLAG_BOLD};
-use freetype::freetype::{FT_SizeRec, FT_UInt, FT_Size_Metrics, struct_FT_Vector_};
-use freetype::freetype::{ft_sfnt_os2};
-use freetype::tt_os2::TT_OS2;
+use freetype_rs::ffi::{FT_Get_Char_Index, FT_Get_Postscript_Name};
+use freetype_rs::ffi::{FT_Load_Glyph, FT_Set_Char_Size};
+use freetype_rs::ffi::{FT_Get_Kerning, FT_Get_Sfnt_Table};
+use freetype_rs::ffi::{FT_New_Memory_Face, FT_Done_Face};
+use freetype_rs::ffi::{FTErrorMethods, FT_F26Dot6, FT_Face, FT_FaceRec};
+use freetype_rs::ffi::{FT_GlyphSlot, FT_Library, FT_Long, FT_ULong};
+use freetype_rs::ffi::{FT_KERNING_DEFAULT, FT_STYLE_FLAG_ITALIC, FT_STYLE_FLAG_BOLD};
+use freetype_rs::ffi::{FT_SizeRec, FT_UInt, FT_Size_Metrics, FT_Vector};
+use freetype_rs::ffi::{ft_sfnt_os2};
+use freetype_rs::ffi::TT_OS2;
 
 use std::mem;
 use std::ptr;
@@ -174,7 +174,7 @@ impl FontHandleMethods for FontHandle {
     fn glyph_h_kerning(&self, first_glyph: GlyphId, second_glyph: GlyphId)
                         -> FractionalPixel {
         assert!(self.face.is_not_null());
-        let mut delta = struct_FT_Vector_ { x: 0, y: 0 };
+        let mut delta = FT_Vector { x: 0, y: 0 };
         unsafe {
             FT_Get_Kerning(self.face, first_glyph, second_glyph, FT_KERNING_DEFAULT, &mut delta);
         }

components/gfx/platform/freetype/font_context.rs

@@ -2,13 +2,26 @@
  * 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 freetype::freetype::FTErrorMethods;
-use freetype::freetype::FT_Add_Default_Modules;
-use freetype::freetype::FT_Done_FreeType;
-use freetype::freetype::FT_Library;
-use freetype::freetype::FT_Memory;
-use freetype::freetype::FT_New_Library;
-use freetype::freetype::struct_FT_MemoryRec_;
+//use freetype::freetype::FTErrorMethods;
+use freetype_rs::ffi::FTErrorMethods;
+
+//use freetype::freetype::FT_Add_Default_Modules;
+use freetype_rs::ffi::FT_Add_Default_Modules;
+
+//use freetype::freetype::FT_Done_FreeType;
+use freetype_rs::ffi::FT_Done_FreeType;
+
+//use freetype::freetype::FT_Library;
+use freetype_rs::ffi::FT_Library;
+
+//use freetype::freetype::FT_Memory;
+use freetype_rs::ffi::FT_Memory;
+
+//use freetype::freetype::FT_New_Library;
+use freetype_rs::ffi::FT_New_Library;
+
+//use freetype::freetype::struct_FT_MemoryRec_;
+use freetype_rs::ffi::FT_MemoryRec;
 
 use std::ptr;
 use std::rc::Rc;
@@ -58,9 +71,9 @@ impl FontContextHandle {
     pub fn new() -> FontContextHandle {
         unsafe {
 
-            let ptr = libc::malloc(mem::size_of::<struct_FT_MemoryRec_>() as size_t);
-            let allocator: &mut struct_FT_MemoryRec_ = mem::transmute(ptr);
-            ptr::write(allocator, struct_FT_MemoryRec_ {
+            let ptr = libc::malloc(mem::size_of::<FT_MemoryRec>() as size_t);
+            let allocator: &mut FT_MemoryRec = mem::transmute(ptr);
+            ptr::write(allocator, FT_MemoryRec {
                 user: ptr::null_mut(),
                 alloc: ft_alloc,
                 free: ft_free,

components/gfx/render_context.rs

@@ -19,8 +19,8 @@ use geom::side_offsets::SideOffsets2D;
 use geom::size::Size2D;
 use libc::size_t;
 use libc::types::common::c99::{uint16_t, uint32_t};
-use png::{RGB8, RGBA8, K8, KA8};
-use servo_net::image::base::Image;
+use servo_image::DynamicImage::{ImageLuma8, ImageLumaA8, ImageRgb8, ImageRgba8};
+use servo_net::image::base::{DynamicImage};
 use servo_util::geometry::Au;
 use servo_util::opts;
 use servo_util::range::Range;
@@ -30,6 +30,7 @@ use style::computed_values::border_style;
 use sync::Arc;
 use text::TextRun;
 use text::glyph::CharIndex;
+use servo_image::{GenericImage, ImageDecoder};
 
 pub struct RenderContext<'a> {
     pub draw_target: &'a DrawTarget,
@@ -109,24 +110,24 @@ impl<'a> RenderContext<'a>  {
         self.draw_target.pop_clip();
     }
 
-    pub fn draw_image(&self, bounds: Rect<Au>, image: Arc<Box<Image>>) {
-        let size = Size2D(image.width as i32, image.height as i32);
-        let (pixel_width, pixels, source_format) = match image.pixels {
-            RGBA8(ref pixels) => (4, pixels.as_slice(), B8G8R8A8),
-            K8(ref pixels) => (1, pixels.as_slice(), A8),
-            RGB8(_) => panic!("RGB8 color type not supported"),
-            KA8(_) => panic!("KA8 color type not supported"),
+    pub fn draw_image(&self, bounds: Rect<Au>, image: Arc<Box<DynamicImage>>) {
+    let (image_width, image_height) = image.dimensions();
+        let size = Size2D(image_width as i32, image_height as i32);
+        let (pixel_width, pixels, source_format) = match **image {
+            ImageRgba8(ref pixels) => (4, pixels.rawbuf(), B8G8R8A8),
+            ImageLuma8(ref pixels) => (1, pixels.rawbuf(), A8),
+            ImageRgb8(_) => panic!("RGB8 color type not supported"),
+            ImageLumaA8(_) => panic!("K8 color type not supported"),
         };
-        let stride = image.width * pixel_width;
-
+        let stride = image_width * pixel_width;
         self.draw_target.make_current();
         let draw_target_ref = &self.draw_target;
         let azure_surface = draw_target_ref.create_source_surface_from_data(pixels,
                                                                             size,
                                                                             stride as i32,
                                                                             source_format);
         let source_rect = Rect(Point2D(0u as AzFloat, 0u as AzFloat),
-                               Size2D(image.width as AzFloat, image.height as AzFloat));
+                               Size2D(image_width as AzFloat, image_height as AzFloat));
         let dest_rect = bounds.to_azure_rect();
         let draw_surface_options = DrawSurfaceOptions::new(Linear, true);
         let draw_options = DrawOptions::new(1.0f64 as AzFloat, 0);

components/layout/display_list_builder.rs

@@ -45,6 +45,7 @@ use style::computed_values::{visibility};
 use style::{ComputedValues, Bottom, Left, RGBA, Right, Top};
 use sync::Arc;
 use url::Url;
+use servo_image::GenericImage;
 
 /// The results of display list building for a single flow.
 pub enum DisplayListBuildingResult {
@@ -218,8 +219,10 @@ impl FragmentDisplayListBuilding for Fragment {
         };
         debug!("(building display list) building background image");
 
-        let image_width = Au::from_px(image.width as int);
-        let image_height = Au::from_px(image.height as int);
+    let (img_width, img_height) = image.dimensions();
+
+        let image_width = Au::from_px(img_width as int);
+        let image_height = Au::from_px(img_height as int);
         let mut bounds = *absolute_bounds;
 
         // Clip.
@@ -258,28 +261,28 @@ impl FragmentDisplayListBuilding for Fragment {
                 bounds.origin.y = abs_y;
                 bounds.size.height = image_height;
                 ImageFragmentInfo::tile_image(&mut bounds.origin.x, &mut bounds.size.width,
-                                                abs_x, image.width);
+                                                abs_x, img_width);
             }
             background_repeat::repeat_y => {
                 bounds.origin.x = abs_x;
                 bounds.size.width = image_width;
                 ImageFragmentInfo::tile_image(&mut bounds.origin.y, &mut bounds.size.height,
-                                                abs_y, image.height);
+                                                abs_y, img_height);
             }
             background_repeat::repeat => {
                 ImageFragmentInfo::tile_image(&mut bounds.origin.x, &mut bounds.size.width,
-                                                abs_x, image.width);
+                                                abs_x, img_width);
                 ImageFragmentInfo::tile_image(&mut bounds.origin.y, &mut bounds.size.height,
-                                                abs_y, image.height);
+                                                abs_y, img_height);
             }
         };
 
         // Create the image display item.
         display_list.push(ImageDisplayItemClass(box ImageDisplayItem {
             base: BaseDisplayItem::new(bounds, self.node, clip_rect),
             image: image.clone(),
-            stretch_size: Size2D(Au::from_px(image.width as int),
-                                 Au::from_px(image.height as int)),
+            stretch_size: Size2D(Au::from_px(img_width as int),
+                                 Au::from_px(img_height as int)),
         }), level);
     }
 

components/layout/lib.rs

@@ -27,6 +27,7 @@ extern crate "net" as servo_net;
 extern crate "msg" as servo_msg;
 #[phase(plugin, link)]
 extern crate "util" as servo_util;
+extern crate "image" as servo_image;
 
 #[phase(plugin)]
 extern crate string_cache_macros;

components/net/Cargo.toml

@@ -25,3 +25,6 @@ git = "https://github.com/servo/rust-stb-image"
 
 [dependencies.url]
 git = "https://github.com/servo/rust-url"
+
+[dependencies.image]
+git = "https://github.com/PistonDevelopers/image"