Merge pull request #334 from pcwalton/nuke-cairo

Nuke cairo

.gitmodules

@@ -76,9 +76,6 @@
 [submodule "src/rust-xlib"]
 	path = src/rust-xlib
 	url = git://github.com/mozilla-servo/rust-xlib.git
-[submodule "src/rust-cairo"]
-	path = src/rust-cairo
-	url = git://github.com/mozilla-servo/rust-cairo.git
 [submodule "src/rust-css"]
 	path = src/rust-css
 	url = git://github.com/mozilla-servo/rust-css.git
@@ -88,9 +85,3 @@
 [submodule "src/rust"]
 	path = src/rust
 	url = git://github.com/mozilla/rust.git
-[submodule "src/cairo"]
-	path = src/cairo
-	url = git://github.com/mozilla-servo/cairo.git
-[submodule "src/pixman"]
-	path = src/pixman
-	url = git://github.com/mozilla-servo/pixman.git

configure

@@ -414,18 +414,10 @@ else
     LIBTOOLIZE=libtoolize
 fi
 
-PIXMAN_ACLOCALCMD="aclocal ${OSX_PKG_CONFIG_M4_MACROS}"
-CAIRO_ACLOCALCMD="aclocal ${OSX_PKG_CONFIG_M4_MACROS} -Ibuild"
 AUTOCMD="${LIBTOOLIZE} && autoconf && autoheader && automake --add-missing --copy --force"
 # Copied from cairo's autogen.sh. Build fails without
-CAIRO_BOILERPLATE="touch boilerplate/Makefile.am.features && touch src/Makefile.am.features"
-PIXMAN_AUTOCMD="${PIXMAN_ACLOCALCMD} && ${AUTOCMD}"
-CAIRO_AUTOCMD="${CAIRO_BOILERPLATE} && ${CAIRO_ACLOCALCMD} && ${AUTOCMD}"
 
-(cd ${CFG_SRC_DIR}src/pixman && eval ${PIXMAN_AUTOCMD}) || exit $?
+CFG_SUBMODULES="libwapcaplet rust-wapcaplet rust-harfbuzz rust-opengles skia rust-azure rust-stb-image rust-geom rust-glut rust-layers rust-http-client libparserutils libhubbub libcss rust-netsurfcss rust-css rust-hubbub sharegl rust-mozjs mozjs"
-(cd ${CFG_SRC_DIR}src/cairo && eval ${CAIRO_AUTOCMD}) || exit $?
-
-CFG_SUBMODULES="libwapcaplet rust-wapcaplet rust-harfbuzz rust-opengles skia rust-azure rust-cairo rust-stb-image rust-geom rust-glut rust-layers rust-http-client libparserutils libhubbub libcss rust-netsurfcss rust-css rust-hubbub sharegl rust-mozjs mozjs pixman cairo"
 
 if [ $CFG_OSTYPE = "apple-darwin" ]
 then
@@ -496,23 +488,11 @@ do
 	CONFIGURE_SCRIPT="${CFG_SRC_DIR}src/${i}/js/src/configure"
     fi
 
-	# needed because Azure's configure wants "--enable-cairo --enable-skia"
+	# needed because Azure's configure wants "--enable-skia"
 	CONFIGURE_ARGS=""
 	ENV_VARS=""
 	if [ $i = "rust-azure" ]; then
-		CONFIGURE_ARGS="--enable-cairo --enable-skia"
+		CONFIGURE_ARGS="--enable-skia"
-	fi
-	# libpng isn't available by default on OS X so don't make it required for cairo
-	# png is in turn required for the svg backend
-	if [ $i = "cairo" -a ${CFG_OSTYPE} = "apple-darwin" ]; then
-		CONFIGURE_ARGS="--enable-png=no --enable-svg=no --enable-ft=no --enable-xlib=no"
-	fi
-
-	# Tell pkg-config that the pixman library is in-tree
-	if [ $i = "cairo" ]; then
-	    export PKG_CONFIG_PATH=../pixman
-	else
-	    export PKG_CONFIG_PATH=
 	fi
 
     if [ -f ${CONFIGURE_SCRIPT} ]

mk/sub.mk

@@ -1,8 +1,6 @@
 # Tests for these submodules will not be run by the default `make check` target.
 SLOW_TESTS += \
 	mozjs \
-	pixman \
-	cairo \
 	$(NULL)
 
 # These submodules will not be cleaned by the `make clean-fast` target.
@@ -13,8 +11,6 @@ SLOW_BUILDS += \
 	mozjs \
 	sharegl \
 	skia \
-	pixman \
-	cairo \
 	$(NULL)
 
 # Builds that do not require rustc
@@ -25,8 +21,6 @@ NATIVE_BUILDS += \
 	libwapcaplet \
 	mozjs \
 	skia \
-	pixman \
-	cairo \
 	$(NULL)
 
 # NOTE: the make magic can only compute transitive build dependencies,
@@ -35,13 +29,8 @@ NATIVE_BUILDS += \
 
 # NB. This should not be a problem once a real package system exists.
 
-DEPS_rust-cairo += \
-	cairo \
-	$(NULL)
-
 DEPS_rust-azure += \
 	rust-geom \
-	rust-cairo \
 	skia \
 	$(NULL)
 
@@ -51,7 +40,6 @@ DEPS_rust-glut += \
 
 DEPS_rust-layers += \
 	rust-azure \
-	rust-cairo \
 	rust-geom \
 	rust-glut \
 	rust-opengles \
@@ -102,14 +90,6 @@ DEPS_libcss += \
 	libparserutils \
 	$(NULL)
 
-DONE_pixman = "$(B)src/pixman/pixman/.libs/libpixman-1.a"
-
-DONE_cairo = "$(B)src/cairo/src/.libs/libcairo.a"
-
-DEPS_cairo += \
-	pixman \
-	$(NULL)
-
 # Platform-specific dependencies
 ifeq ($(CFG_OSTYPE),apple-darwin)
 DEPS_rust-azure += \
@@ -119,11 +99,6 @@ DEPS_rust-azure += \
 	skia \
 	$(NULL)
 
-DEPS_rust-cairo += \
-	rust-core-foundation \
-	rust-core-graphics \
-	$(NULL)
-
 DEPS_rust-io-surface += \
 	rust-core-foundation \
 	$(NULL)
@@ -152,12 +127,6 @@ endif
 
 ifeq ($(CFG_OSTYPE),unknown-linux-gnu)
 
-DEPS_rust-cairo += \
-	rust-freetype \
-	rust-fontconfig \
-	rust-xlib \
-	$(NULL)
-
 DEPS_rust-azure += \
 	rust-freetype \
 	rust-fontconfig \

src/README.md

@@ -16,7 +16,6 @@ These are the main servo projects, as well as projects that are pure Rust (not b
 
 ## Third-party projects
 
-* _cairo_ - The cairo rendering library
 * _libcss_ - The CSS library from the NetSurf web browser. We are using this for parsing
     and selector matching until we have a Rust solution
 * _libhubbub_ - The HTML parser from the NetSurf web browser. We are using this for parsing
@@ -24,7 +23,6 @@ These are the main servo projects, as well as projects that are pure Rust (not b
 * _libparserutils_ - A parsing library used by libcss and libhubbub
 * _libwapcaplet_ - A string internment library used by libcss and libhubbub
 * _mozjs_ - The SpiderMonkey JavaScript engine, forked from mozilla-central
-* _pixman_ - Pixel manipulation library (used by cairo)
 * _rust-azure_ - mozilla-central's 2D vector graphics abstraction layer and bindings
 * _rust-harfbuzz_ - The harfbuzz text shaping library and bindings
 * _rust-stb-image_ - The stb_image library and bindings. We are using this for image decoding
@@ -33,7 +31,6 @@ These are the main servo projects, as well as projects that are pure Rust (not b
 
 ## Library bindings
 
-* _rust-cairo_ - Bindings to the cairo drawing library, a backend for Azure
 * _rust-cocoa_ - Bindings to OS X's Cocoa framework
 * _rust-core-foundation_ - Bindings to OS X's Core Foundation framework
 * _rust-core-graphics_ - Bindings to OS X's Core Graphics framework, a backend for Azure

src/cairo

@@ -1 +0,0 @@
-Subproject commit c6402195adc8830d4b2eba3f755044842edb3ae6

src/pixman

@@ -1 +0,0 @@
-Subproject commit 958bd334b3c17f529c80f2eeef4224f45c62f292

src/rust-azure

@@ -1 +1 @@
-Subproject commit 39f62f257f7a85e8a5226a4511a57b7956619d9f
+Subproject commit 7182446a4370aea910fd767219813e8effd39067

src/rust-cairo

@@ -1 +0,0 @@
-Subproject commit a8f510a3722f14202ff7d111910fa4a1f04fae45

src/rust-layers

@@ -1 +1 @@
-Subproject commit d156fe3d16deb290dbd985b5bdd0046d63500105
+Subproject commit ab69046850bfb65b4ddc1c077d17a7f6a089f65f

src/rust-mozjs

@@ -1 +1 @@
-Subproject commit f426314f293d710db330265c6f2033d708246937
+Subproject commit 3a4d2d8221ca78e694fc7d15b1154fd1c57a44e5

src/servo-gfx/opts.rs

@@ -66,7 +66,7 @@ pub fn from_cmdline_args(args: &[~str]) -> Opts {
                 fail!(~"unknown backend type")
             }
         }
-        None => CairoBackend
+        None => SkiaBackend
     };
 
     let tile_size: uint = match getopts::opt_maybe_str(&opt_match, ~"s") {

src/servo-gfx/servo_gfx.rc

@@ -9,7 +9,6 @@
 #[crate_type = "lib"];
 
 extern mod azure;
-extern mod cairo;
 extern mod geom;
 extern mod http_client;
 extern mod stb_image;

src/servo/servo.rc

@@ -14,7 +14,6 @@
 #[legacy_records];
 
 extern mod azure;
-extern mod cairo;
 extern mod geom;
 extern mod gfx (name = "servo_gfx");
 extern mod glut;