Bug 908523 - Build Skia on GTK3 widget. r=karlt,gps
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Wed, 28 Aug 2013 20:14:47 +0900
changeset 144671 6543f1ad96559d48cc7cd5f39ae6e325e4fc80f4
parent 144670 e473c952d2338c3497b8ca7aeee25c8d2dd198ef
child 144672 52e322d094760943e939ca8007015d390a256828
child 144703 f280351a238f05cb2666e89a080cf2778ec76e02
push id33049
push userm_kato@ga2.so-net.ne.jp
push dateWed, 28 Aug 2013 11:18:45 +0000
treeherdermozilla-inbound@6543f1ad9655 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskarlt, gps
bugs908523
milestone26.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 908523 - Build Skia on GTK3 widget. r=karlt,gps
configure.in
gfx/skia/Makefile.in
gfx/skia/moz.build
media/webrtc/signaling/test/Makefile.in
--- a/configure.in
+++ b/configure.in
@@ -8116,17 +8116,18 @@ if test "${OS_TARGET}" = "WINNT"; then
     AC_SUBST(MOZ_ENABLE_DIRECT2D1_1)
   fi
 fi
 
 if test "${OS_TARGET}" = "WINNT" -o \
         "${OS_ARCH}" = "Darwin" -o \
         "${MOZ_WIDGET_TOOLKIT}" = "android" -o \
         "${MOZ_WIDGET_TOOLKIT}" = "gonk" -o \
-        "${MOZ_WIDGET_TOOLKIT}" = "gtk2"; then
+        "${MOZ_WIDGET_TOOLKIT}" = "gtk2" -o \
+        "${MOZ_WIDGET_TOOLKIT}" = "gtk3"; then
     case "${target_cpu}" in
     i*86*|x86_64|arm)
         MOZ_ENABLE_SKIA=1
         ;;
     *)
         MOZ_ENABLE_SKIA=
         ;;
     esac
--- a/gfx/skia/Makefile.in
+++ b/gfx/skia/Makefile.in
@@ -57,28 +57,28 @@ VPATH += \
 	$(srcdir)/src/sfnt \
 	$(NULL)
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),$(findstring $(MOZ_WIDGET_TOOLKIT),android gonk))
 OS_CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(CAIRO_FT_CFLAGS)
 DEFINES += -DSK_FONTHOST_CAIRO_STANDALONE=0
 endif
 
-ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
+ifdef MOZ_WIDGET_GTK
 OS_CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PANGO_CFLAGS) $(CAIRO_FT_CFLAGS)
 endif
 
 ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
 OS_CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PANGO_CFLAGS) $(CAIRO_FT_CFLAGS)
 ifeq (Linux,$(OS_TARGET))
 DEFINES += -DSK_USE_POSIX_THREADS=1
 endif
 endif
 
-ifeq ($(MOZ_WIDGET_TOOLKIT),$(findstring $(MOZ_WIDGET_TOOLKIT),android gtk2 gonk cocoa))
+ifeq ($(MOZ_WIDGET_TOOLKIT),$(findstring $(MOZ_WIDGET_TOOLKIT),android gtk2 gtk3 gonk cocoa))
 DEFINES += -DSK_USE_POSIX_THREADS=1
 endif
 
 ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
 DEFINES += -DSKIA_IMPLEMENTATION=1 -DGR_IMPLEMENTATION=1
 endif
 
 ifneq (,$(INTEL_ARCHITECTURE))
--- a/gfx/skia/moz.build
+++ b/gfx/skia/moz.build
@@ -166,17 +166,17 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wi
     ]
     CPP_SOURCES += [
         'SkFontHost_win.cpp',
         'SkFontHost_sandbox_none.cpp',
         'SkThread_win.cpp',
         'SkThreadUtils_win.cpp',
         'SkTime_win.cpp',
     ]
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2':
+elif CONFIG['MOZ_WIDGET_GTK']:
     EXPORTS.skia += [
         'include/ports/SkTypeface_cairo.h',
     ]
     CPP_SOURCES += [
         'SkFontHost_cairo.cpp',
         'SkFontHost_FreeType_common.cpp',
         'SkThread_pthread.cpp',
         'SkThreadUtils_pthread.cpp',
--- a/media/webrtc/signaling/test/Makefile.in
+++ b/media/webrtc/signaling/test/Makefile.in
@@ -70,16 +70,23 @@ endif
 ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
 LIBS += \
   $(XLIBS) \
   $(MOZ_GTK2_LIBS) \
   -lgthread-2.0 \
   $(NULL)
 endif
 
+ifeq (gtk3,$(MOZ_WIDGET_TOOLKIT))
+LIBS += \
+  $(MOZ_GTK3_LIBS) \
+  $(FT2_LIBS) \
+  $(NULL)
+endif
+
 ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
 LIBS += \
   $(XLIBS) \
   $(TK_LIBS) \
   $(MOZ_PANGO_LIBS) \
   $(NULL)
 endif