Bug 976392 - Move moz2d to libxul; r=jrmuizel
authorEhsan Akhgari <ehsan@mozilla.com>
Tue, 25 Feb 2014 15:42:23 -0500
changeset 170553 852fa926deae9ad52b4727cb293db459530df7d2
parent 170552 d11a993d78468f867ee21093d81dadae8404d750
child 170554 e633c972f2264f01ec6a7768d92e7cee6c5c33e8
push id26291
push userkwierso@gmail.com
push dateWed, 26 Feb 2014 04:10:11 +0000
treeherdermozilla-central@626d99c084cb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjrmuizel
bugs976392
milestone30.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 976392 - Move moz2d to libxul; r=jrmuizel
gfx/2d/moz.build
layout/media/symbols.def.in
--- a/gfx/2d/moz.build
+++ b/gfx/2d/moz.build
@@ -60,18 +60,16 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wi
             'RadialGradientEffectD2D1.cpp',
             'SourceSurfaceD2D1.cpp'
         ]
         DEFINES['USE_D2D1_1'] = True
     if CONFIG['MOZ_ENABLE_SKIA']:
         SOURCES += [
             'ScaledFontWin.cpp',
         ]
-        DEFINES['SKIA_IMPLEMENTATION'] = 1
-        DEFINES['GR_IMPLEMENTATION'] = 1
 
 if CONFIG['MOZ_ENABLE_SKIA']:
     UNIFIED_SOURCES += [
         'convolver.cpp',
         'DrawTargetSkia.cpp',
         'PathSkia.cpp',
         'SourceSurfaceSkia.cpp',
     ]
@@ -122,17 +120,17 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
     ]
 
 FAIL_ON_WARNINGS = True
 
 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
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk2', 'gtk3', 'gonk', 'qt'):
     DEFINES['MOZ_ENABLE_FREETYPE'] = True
 
 DEFINES['SK_A32_SHIFT'] = 24
--- a/layout/media/symbols.def.in
+++ b/layout/media/symbols.def.in
@@ -371,16 +371,17 @@ MOZ_XML_StopParser
 _moz_cairo_in_fill
 _moz_cairo_in_stroke
 _moz_cairo_line_to
 _moz_cairo_mask
 _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
 _moz_cairo_matrix_scale
 _moz_cairo_matrix_transform_distance
 _moz_cairo_matrix_transform_point
 _moz_cairo_matrix_translate
 _moz_cairo_move_to
@@ -409,16 +410,17 @@ MOZ_XML_StopParser
 _moz_cairo_pattern_reference
 _moz_cairo_pattern_set_extend
 _moz_cairo_pattern_set_filter
 _moz_cairo_pattern_set_matrix
 _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
 _moz_cairo_reference
 _moz_cairo_reset_clip
 _moz_cairo_restore
 _moz_cairo_rotate
 _moz_cairo_save