From d9a96c50e86f5d9b32324c2b01fc63ca36621fe6 Mon Sep 17 00:00:00 2001 From: Oleg Romashin Date: Tue, 18 Feb 2014 12:45:31 -0800 Subject: [PATCH] Bug 974335 - Refactor Qt Widget Backend implementation. skia build fix. r=gw280 --- gfx/skia/generate_mozbuild.py | 6 +++++- gfx/skia/moz.build | 16 ++++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py index aa9dc006083..040a793955e 100755 --- a/gfx/skia/generate_mozbuild.py +++ b/gfx/skia/generate_mozbuild.py @@ -54,7 +54,7 @@ DEFINES['SK_R32_SHIFT'] = 16 DEFINES['SK_G32_SHIFT'] = 8 DEFINES['SK_B32_SHIFT'] = 0 -if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk2', 'gtk3', 'gonk', 'cocoa'): +if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk2', 'gtk3', 'qt', 'gonk', 'cocoa'): DEFINES['SK_USE_POSIX_THREADS'] = 1 if CONFIG['INTEL_ARCHITECTURE'] and CONFIG['HAVE_TOOLCHAIN_SUPPORT_MSSSE3']: @@ -63,6 +63,7 @@ if CONFIG['INTEL_ARCHITECTURE'] and CONFIG['HAVE_TOOLCHAIN_SUPPORT_MSSSE3']: if (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android') or \ (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa') or \ (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk') or \ + CONFIG['MOZ_WIDGET_QT'] or \ CONFIG['MOZ_WIDGET_GTK']: DEFINES['SK_FONTHOST_DOES_NOT_USE_FONTMGR'] = 1 @@ -272,6 +273,9 @@ def write_mozbuild(includes, sources): f.write("if CONFIG['MOZ_WIDGET_GTK']:\n") write_list(f, 'SOURCES', sources['linux'], 4) + f.write("if CONFIG['MOZ_WIDGET_QT']:\n") + write_list(f, 'SOURCES', sources['linux'], 4) + f.write("if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':\n") write_list(f, 'SOURCES', sources['win'], 4) diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build index 0efbfd89f1b..779fe106fd8 100644 --- a/gfx/skia/moz.build +++ b/gfx/skia/moz.build @@ -734,6 +734,18 @@ if CONFIG['MOZ_WIDGET_GTK']: 'trunk/src/ports/SkTLS_pthread.cpp', 'trunk/src/utils/SkThreadUtils_pthread.cpp', ] +if CONFIG['MOZ_WIDGET_QT']: + SOURCES += [ + 'trunk/src/ports/SkDebug_stdio.cpp', + 'trunk/src/ports/SkFontHost_cairo.cpp', + 'trunk/src/ports/SkFontHost_FreeType.cpp', + 'trunk/src/ports/SkFontHost_FreeType_common.cpp', + 'trunk/src/ports/SkOSFile_posix.cpp', + 'trunk/src/ports/SkTime_Unix.cpp', + 'trunk/src/ports/SkTLS_pthread.cpp', + 'trunk/src/utils/SkThreadUtils_pthread.cpp', + 'trunk/src/utils/SkThreadUtils_pthread_linux.cpp', + ] if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': SOURCES += [ 'trunk/src/ports/SkDebug_win.cpp', @@ -830,13 +842,13 @@ DEFINES['SK_R32_SHIFT'] = 16 DEFINES['SK_G32_SHIFT'] = 8 DEFINES['SK_B32_SHIFT'] = 0 -if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk2', 'gtk3', 'gonk', 'cocoa'): +if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk2', 'gtk3', 'qt', 'gonk', 'cocoa'): DEFINES['SK_USE_POSIX_THREADS'] = 1 if CONFIG['INTEL_ARCHITECTURE'] and CONFIG['HAVE_TOOLCHAIN_SUPPORT_MSSSE3']: DEFINES['SK_BUILD_SSSE3'] = 1 -if (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android') or (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk') or (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa') or CONFIG['MOZ_WIDGET_GTK']: +if (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android') or (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk') or (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa') or CONFIG['MOZ_WIDGET_GTK'] or CONFIG['MOZ_WIDGET_QT']: DEFINES['SK_FONTHOST_DOES_NOT_USE_FONTMGR'] = 1 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':