From 91df1527b590020ab05f8ea62ff5e2d733a6d4a4 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Tue, 25 Feb 2014 15:42:23 -0500
Subject: [PATCH] Bug 976392 - Move moz2d to libxul; r=jrmuizel

---
 gfx/2d/moz.build            | 4 +---
 layout/media/symbols.def.in | 2 ++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gfx/2d/moz.build b/gfx/2d/moz.build
index c2b7518eb1c..45d9bb55484 100644
--- a/gfx/2d/moz.build
+++ b/gfx/2d/moz.build
@@ -65,8 +65,6 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
         SOURCES += [
             'ScaledFontWin.cpp',
         ]
-        DEFINES['SKIA_IMPLEMENTATION'] = 1
-        DEFINES['GR_IMPLEMENTATION'] = 1
 
 if CONFIG['MOZ_ENABLE_SKIA']:
     UNIFIED_SOURCES += [
@@ -127,7 +125,7 @@ MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
-FINAL_LIBRARY = 'gkmedias'
+FINAL_LIBRARY = 'xul'
 
 for var in ('MOZ_GFX', 'USE_CAIRO', 'GFX2D_INTERNAL', 'MOZ2D_HAS_MOZ_CAIRO'):
     DEFINES[var] = True
diff --git a/layout/media/symbols.def.in b/layout/media/symbols.def.in
index e87c3282c84..538f3aaf0fd 100644
--- a/layout/media/symbols.def.in
+++ b/layout/media/symbols.def.in
@@ -376,6 +376,7 @@ _moz_cairo_mask_surface
 _moz_cairo_matrix_init
 _moz_cairo_matrix_init_identity
 _moz_cairo_matrix_init_scale
+_moz_cairo_matrix_init_translate
 _moz_cairo_matrix_invert
 _moz_cairo_matrix_multiply
 _moz_cairo_matrix_rotate
@@ -414,6 +415,7 @@ _moz_cairo_pattern_status
 _moz_cairo_pdf_surface_create_for_stream
 _moz_cairo_pop_group
 _moz_cairo_pop_group_to_source
+_moz_cairo_push_group
 _moz_cairo_push_group_with_content
 _moz_cairo_rectangle
 _moz_cairo_rectangle_list_destroy