wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-28 03:17:31 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #80 - De-unify gfx/skia and stop using dangerous opts

Browse source
This commit is contained in:
Moonchild 2020-05-14 19:52:40 +00:00 • committed by Roy Tam
commit b22c360506
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gfx/skia/generate_mozbuild.py
View file

@ -28,7 +28,7 @@ if CONFIG['MOZ_OPTIMIZE']:
if CONFIG['_MSC_VER']: if CONFIG['_MSC_VER']:
skia_opt_flags += ['-O2'] skia_opt_flags += ['-O2']
elif CONFIG['GNU_CC']: elif CONFIG['GNU_CC']:
skia_opt_flags += ['-O3'] skia_opt_flags += ['-O2']
""" """
@ -79,7 +79,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in {
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
DEFINES['UNICODE'] = True DEFINES['UNICODE'] = True
DEFINES['_UNICODE'] = True DEFINES['_UNICODE'] = True
UNIFIED_SOURCES += [ SOURCES += [
'skia/src/fonts/SkFontMgr_indirect.cpp', 'skia/src/fonts/SkFontMgr_indirect.cpp',
'skia/src/fonts/SkRemotableFontMgr.cpp', 'skia/src/fonts/SkRemotableFontMgr.cpp',
] ]
@ -415,7 +415,7 @@ def write_sources(f, values, indent):
else: else:
sources['unified'].add(item) sources['unified'].add(item)
write_list(f, "UNIFIED_SOURCES", sources['unified'], indent) write_list(f, "SOURCES", sources['unified'], indent)
write_list(f, "SOURCES", sources['nonunified'], indent) write_list(f, "SOURCES", sources['nonunified'], indent)
def write_list(f, name, values, indent): def write_list(f, name, values, indent):

18
gfx/skia/moz.build
View file

@ -20,9 +20,9 @@ if CONFIG['MOZ_OPTIMIZE']:
if CONFIG['_MSC_VER']: if CONFIG['_MSC_VER']:
skia_opt_flags += ['-O2'] skia_opt_flags += ['-O2']
elif CONFIG['GNU_CC']: elif CONFIG['GNU_CC']:
skia_opt_flags += ['-O3'] skia_opt_flags += ['-O2']
UNIFIED_SOURCES += [ SOURCES += [
'skia/src/core/SkAAClip.cpp', 'skia/src/core/SkAAClip.cpp',
'skia/src/core/SkAlphaRuns.cpp', 'skia/src/core/SkAlphaRuns.cpp',
'skia/src/core/SkAnnotation.cpp', 'skia/src/core/SkAnnotation.cpp',
@ -308,7 +308,7 @@ SOURCES['skia/src/core/SkSpriteBlitter4f.cpp'].flags += skia_opt_flags
SOURCES['skia/src/core/SkSpriteBlitter_ARGB32.cpp'].flags += skia_opt_flags SOURCES['skia/src/core/SkSpriteBlitter_ARGB32.cpp'].flags += skia_opt_flags
SOURCES['skia/src/core/SkSpriteBlitter_RGB16.cpp'].flags += skia_opt_flags SOURCES['skia/src/core/SkSpriteBlitter_RGB16.cpp'].flags += skia_opt_flags
if CONFIG['MOZ_ENABLE_SKIA_PDF']: if CONFIG['MOZ_ENABLE_SKIA_PDF']:
UNIFIED_SOURCES += [ SOURCES += [
'skia/src/core/SkMD5.cpp', 'skia/src/core/SkMD5.cpp',
'skia/src/pdf/SkDeflate.cpp', 'skia/src/pdf/SkDeflate.cpp',
'skia/src/pdf/SkJpegInfo.cpp', 'skia/src/pdf/SkJpegInfo.cpp',
@ -332,7 +332,7 @@ if CONFIG['MOZ_ENABLE_SKIA_PDF']:
'skia/src/pdf/SkPDFFont.cpp', 'skia/src/pdf/SkPDFFont.cpp',
] ]
if CONFIG['MOZ_ENABLE_SKIA_GPU']: if CONFIG['MOZ_ENABLE_SKIA_GPU']:
UNIFIED_SOURCES += [ SOURCES += [
'skia/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp', 'skia/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp',
'skia/src/gpu/batches/GrAnalyticRectBatch.cpp', 'skia/src/gpu/batches/GrAnalyticRectBatch.cpp',
'skia/src/gpu/batches/GrAtlasTextBatch.cpp', 'skia/src/gpu/batches/GrAtlasTextBatch.cpp',
@ -517,7 +517,7 @@ if CONFIG['MOZ_ENABLE_SKIA_GPU']:
'skia/src/image/SkImage_Gpu.cpp', 'skia/src/image/SkImage_Gpu.cpp',
] ]
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android'): if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android'):
UNIFIED_SOURCES += [ SOURCES += [
'skia/src/ports/SkDebug_android.cpp', 'skia/src/ports/SkDebug_android.cpp',
'skia/src/ports/SkOSFile_posix.cpp', 'skia/src/ports/SkOSFile_posix.cpp',
'skia/src/ports/SkOSLibrary_posix.cpp', 'skia/src/ports/SkOSLibrary_posix.cpp',
@ -529,7 +529,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android'):
'skia/src/ports/SkFontHost_FreeType_common.cpp', 'skia/src/ports/SkFontHost_FreeType_common.cpp',
] ]
if CONFIG['MOZ_WIDGET_TOOLKIT'] in {'cocoa', 'uikit'}: if CONFIG['MOZ_WIDGET_TOOLKIT'] in {'cocoa', 'uikit'}:
UNIFIED_SOURCES += [ SOURCES += [
'skia/src/ports/SkDebug_stdio.cpp', 'skia/src/ports/SkDebug_stdio.cpp',
'skia/src/ports/SkOSFile_posix.cpp', 'skia/src/ports/SkOSFile_posix.cpp',
'skia/src/ports/SkOSLibrary_posix.cpp', 'skia/src/ports/SkOSLibrary_posix.cpp',
@ -542,7 +542,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in {'cocoa', 'uikit'}:
'skia/src/ports/SkFontHost_mac.cpp', 'skia/src/ports/SkFontHost_mac.cpp',
] ]
if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
UNIFIED_SOURCES += [ SOURCES += [
'skia/src/ports/SkDebug_stdio.cpp', 'skia/src/ports/SkDebug_stdio.cpp',
'skia/src/ports/SkOSFile_posix.cpp', 'skia/src/ports/SkOSFile_posix.cpp',
'skia/src/ports/SkOSLibrary_posix.cpp', 'skia/src/ports/SkOSLibrary_posix.cpp',
@ -574,7 +574,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
'skia/src/utils/win/SkIStream.cpp', 'skia/src/utils/win/SkIStream.cpp',
] ]
if CONFIG['INTEL_ARCHITECTURE']: if CONFIG['INTEL_ARCHITECTURE']:
UNIFIED_SOURCES += [ SOURCES += [
'skia/src/opts/opts_check_x86.cpp', 'skia/src/opts/opts_check_x86.cpp',
] ]
SOURCES += [ SOURCES += [
@ -598,7 +598,7 @@ if CONFIG['INTEL_ARCHITECTURE']:
SOURCES['skia/src/opts/SkOpts_sse42.cpp'].flags += skia_opt_flags SOURCES['skia/src/opts/SkOpts_sse42.cpp'].flags += skia_opt_flags
SOURCES['skia/src/opts/SkOpts_ssse3.cpp'].flags += skia_opt_flags SOURCES['skia/src/opts/SkOpts_ssse3.cpp'].flags += skia_opt_flags
elif CONFIG['CPU_ARCH'] in ('arm', 'aarch64') and CONFIG['GNU_CC']: elif CONFIG['CPU_ARCH'] in ('arm', 'aarch64') and CONFIG['GNU_CC']:
UNIFIED_SOURCES += [ SOURCES += [
'skia/src/core/SkUtilsArm.cpp', 'skia/src/core/SkUtilsArm.cpp',
] ]
SOURCES += [ SOURCES += [