Bug 571989, much-delayed part 6: merge gfx/src/thebes into gfx/src. r=joedrew
authorZack Weinberg <zackw@panix.com>
Thu, 31 Mar 2011 11:30:28 -0700
changeset 64518 ff28c9aab04c4d61dbf3132df5e31f82ccdf16cc
parent 64517 e38b294f02c5a6254ac33c919b65fa0798325cb3
child 64519 e88652085a4e3734cf6f5d1dedad63ef5c2e0ad7
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjoedrew
bugs571989
milestone2.2a1pre
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 571989, much-delayed part 6: merge gfx/src/thebes into gfx/src. r=joedrew
gfx/Makefile.in
gfx/src/Makefile.in
gfx/src/mozilla-decoder.cpp
gfx/src/mozilla-decoder.h
gfx/src/nsIThebesFontMetrics.h
gfx/src/nsSystemFontsAndroid.cpp
gfx/src/nsSystemFontsAndroid.h
gfx/src/nsSystemFontsGTK2.cpp
gfx/src/nsSystemFontsGTK2.h
gfx/src/nsSystemFontsMac.h
gfx/src/nsSystemFontsMac.mm
gfx/src/nsSystemFontsOS2.cpp
gfx/src/nsSystemFontsOS2.h
gfx/src/nsSystemFontsQt.cpp
gfx/src/nsSystemFontsQt.h
gfx/src/nsSystemFontsWin.cpp
gfx/src/nsSystemFontsWin.h
gfx/src/nsThebesDeviceContext.cpp
gfx/src/nsThebesDeviceContext.h
gfx/src/nsThebesFontEnumerator.cpp
gfx/src/nsThebesFontEnumerator.h
gfx/src/nsThebesFontMetrics.cpp
gfx/src/nsThebesFontMetrics.h
gfx/src/nsThebesGfxFactory.cpp
gfx/src/nsThebesRegion.cpp
gfx/src/nsThebesRegion.h
gfx/src/nsThebesRenderingContext.cpp
gfx/src/nsThebesRenderingContext.h
gfx/src/thebes/Makefile.in
gfx/src/thebes/mozilla-decoder.cpp
gfx/src/thebes/mozilla-decoder.h
gfx/src/thebes/nsIThebesFontMetrics.h
gfx/src/thebes/nsSystemFontsAndroid.cpp
gfx/src/thebes/nsSystemFontsAndroid.h
gfx/src/thebes/nsSystemFontsGTK2.cpp
gfx/src/thebes/nsSystemFontsGTK2.h
gfx/src/thebes/nsSystemFontsMac.h
gfx/src/thebes/nsSystemFontsMac.mm
gfx/src/thebes/nsSystemFontsOS2.cpp
gfx/src/thebes/nsSystemFontsOS2.h
gfx/src/thebes/nsSystemFontsQt.cpp
gfx/src/thebes/nsSystemFontsQt.h
gfx/src/thebes/nsSystemFontsWin.cpp
gfx/src/thebes/nsSystemFontsWin.h
gfx/src/thebes/nsThebesDeviceContext.cpp
gfx/src/thebes/nsThebesDeviceContext.h
gfx/src/thebes/nsThebesFontEnumerator.cpp
gfx/src/thebes/nsThebesFontEnumerator.h
gfx/src/thebes/nsThebesFontMetrics.cpp
gfx/src/thebes/nsThebesFontMetrics.h
gfx/src/thebes/nsThebesGfxFactory.cpp
gfx/src/thebes/nsThebesRegion.cpp
gfx/src/thebes/nsThebesRegion.h
gfx/src/thebes/nsThebesRenderingContext.cpp
gfx/src/thebes/nsThebesRenderingContext.h
toolkit/library/libxul-config.mk
toolkit/toolkit-makefiles.sh
--- a/gfx/Makefile.in
+++ b/gfx/Makefile.in
@@ -54,17 +54,17 @@ endif
 # be built first so the order is reversed.
 ifndef BUILD_STATIC_LIBS
 DIRS		+= ycbcr
 endif
 
 DIRS		+= angle
 
 
-DIRS		+= src qcms layers harfbuzz/src ots/src thebes src/thebes
+DIRS		+= src qcms layers harfbuzz/src ots/src thebes
 
 ifdef BUILD_STATIC_LIBS
 DIRS		+= ycbcr
 endif
 
 ifdef MOZ_IPC
 DIRS		+= ipc
 endif
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@@ -38,20 +38,24 @@
 DEPTH       = ../..
 topsrcdir   = @top_srcdir@
 srcdir      = @srcdir@
 VPATH       = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE         = gfx
+MODULE_NAME    = nsGfxModule
 LIBRARY_NAME   = gkgfx
 EXPORT_LIBRARY = 1
 GRE_MODULE     = 1
 LIBXUL_LIBRARY = 1
+IS_COMPONENT   = 1
+# This library is used by other shared libs in a static build
+FORCE_USE_PIC  = 1
 
 XPIDLSRCS = \
 	nsIFontEnumerator.idl \
 	nsIScriptableRegion.idl \
 	gfxIFormats.idl \
 	gfxidltypes.idl \
 	$(NULL)
 
@@ -71,58 +75,79 @@ EXPORTS	= \
 	nsIRenderingContext.h \
 	nsIFontMetrics.h \
 	nsIDeviceContext.h \
 	nsGfxCIID.h \
 	nsIRegion.h \
 	nsITheme.h \
 	nsThemeConstants.h \
 	gfxCrashReporterUtils.h \
+	nsIThebesFontMetrics.h \
 	$(NULL)
 
 ifdef MOZ_X11
 EXPORTS_NAMESPACES	= mozilla
 EXPORTS_mozilla		= X11Util.h
 endif
 
 CPPSRCS = \
         nsColor.cpp \
         nsFont.cpp \
         nsRect.cpp \
         nsRegion.cpp \
         nsTransform2D.cpp \
         nsScriptableRegion.cpp \
         gfxCrashReporterUtils.cpp \
+        nsThebesDeviceContext.cpp \
+        nsThebesRegion.cpp \
+        nsThebesGfxFactory.cpp \
+        nsThebesRenderingContext.cpp \
+        nsThebesFontMetrics.cpp \
+        nsThebesFontEnumerator.cpp \
        $(NULL)
 
-EXTRA_DSO_LDOPTS = \
-        $(MOZ_UNICHARUTIL_LIBS) \
-        $(MOZ_COMPONENT_LIBS) \
-        $(MOZ_JS_LIBS) \
-        $(NULL)
-
 ifdef MOZ_X11
-CPPSRCS += \
-        X11Util.cpp \
-        $(NULL)
-EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS)
+CPPSRCS += X11Util.cpp
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),android)
+CPPSRCS += nsSystemFontsAndroid.cpp
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
+CMMSRCS = nsSystemFontsMac.mm
 endif
 
-ifneq (,$(filter cocoa,$(MOZ_WIDGET_TOOLKIT)))
-EXTRA_DSO_LDOPTS += \
-        $(TK_LIBS) \
-        $(NULL)
+ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+CPPSRCS += nsSystemFontsGTK2.cpp
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
+CPPSRCS += nsSystemFontsOS2.cpp
 endif
 
-# This library is used by other shared libs in a static build
-FORCE_USE_PIC = 1
+ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
+CPPSRCS += nsSystemFontsQt.cpp
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
+CPPSRCS += nsSystemFontsWin.cpp
+OS_LIBS += $(call EXPAND_LIBNAME,usp10)
+endif
 
 include $(topsrcdir)/config/rules.mk
 
+CXXFLAGS += $(TK_CFLAGS) $(MOZ_CAIRO_CFLAGS)
+
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-CXXFLAGS += $(MOZ_GTK2_CFLAGS)
+DEFINES += -DMOZ_ENABLE_GTK2
+CXXFLAGS += $(MOZ_GTK2_CFLAGS) $(MOZ_PANGO_CFLAGS)
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
+CXXFLAGS += $(CAIRO_FT_CFLAGS)
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
 CXXFLAGS += $(MOZ_QT_CFLAGS)
 endif
 
-DEFINES     += -D_IMPL_NS_GFX
+DEFINES += -D_IMPL_NS_GFX
rename from gfx/src/thebes/mozilla-decoder.cpp
rename to gfx/src/mozilla-decoder.cpp
rename from gfx/src/thebes/mozilla-decoder.h
rename to gfx/src/mozilla-decoder.h
rename from gfx/src/thebes/nsIThebesFontMetrics.h
rename to gfx/src/nsIThebesFontMetrics.h
rename from gfx/src/thebes/nsSystemFontsAndroid.cpp
rename to gfx/src/nsSystemFontsAndroid.cpp
rename from gfx/src/thebes/nsSystemFontsAndroid.h
rename to gfx/src/nsSystemFontsAndroid.h
rename from gfx/src/thebes/nsSystemFontsGTK2.cpp
rename to gfx/src/nsSystemFontsGTK2.cpp
rename from gfx/src/thebes/nsSystemFontsGTK2.h
rename to gfx/src/nsSystemFontsGTK2.h
rename from gfx/src/thebes/nsSystemFontsMac.h
rename to gfx/src/nsSystemFontsMac.h
rename from gfx/src/thebes/nsSystemFontsMac.mm
rename to gfx/src/nsSystemFontsMac.mm
rename from gfx/src/thebes/nsSystemFontsOS2.cpp
rename to gfx/src/nsSystemFontsOS2.cpp
rename from gfx/src/thebes/nsSystemFontsOS2.h
rename to gfx/src/nsSystemFontsOS2.h
rename from gfx/src/thebes/nsSystemFontsQt.cpp
rename to gfx/src/nsSystemFontsQt.cpp
rename from gfx/src/thebes/nsSystemFontsQt.h
rename to gfx/src/nsSystemFontsQt.h
rename from gfx/src/thebes/nsSystemFontsWin.cpp
rename to gfx/src/nsSystemFontsWin.cpp
rename from gfx/src/thebes/nsSystemFontsWin.h
rename to gfx/src/nsSystemFontsWin.h
rename from gfx/src/thebes/nsThebesDeviceContext.cpp
rename to gfx/src/nsThebesDeviceContext.cpp
rename from gfx/src/thebes/nsThebesDeviceContext.h
rename to gfx/src/nsThebesDeviceContext.h
rename from gfx/src/thebes/nsThebesFontEnumerator.cpp
rename to gfx/src/nsThebesFontEnumerator.cpp
rename from gfx/src/thebes/nsThebesFontEnumerator.h
rename to gfx/src/nsThebesFontEnumerator.h
rename from gfx/src/thebes/nsThebesFontMetrics.cpp
rename to gfx/src/nsThebesFontMetrics.cpp
rename from gfx/src/thebes/nsThebesFontMetrics.h
rename to gfx/src/nsThebesFontMetrics.h
rename from gfx/src/thebes/nsThebesGfxFactory.cpp
rename to gfx/src/nsThebesGfxFactory.cpp
rename from gfx/src/thebes/nsThebesRegion.cpp
rename to gfx/src/nsThebesRegion.cpp
rename from gfx/src/thebes/nsThebesRegion.h
rename to gfx/src/nsThebesRegion.h
rename from gfx/src/thebes/nsThebesRenderingContext.cpp
rename to gfx/src/nsThebesRenderingContext.cpp
rename from gfx/src/thebes/nsThebesRenderingContext.h
rename to gfx/src/nsThebesRenderingContext.h
deleted file mode 100644
--- a/gfx/src/thebes/Makefile.in
+++ /dev/null
@@ -1,132 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is thebes gfx
-#
-# The Initial Developer of the Original Code is
-# mozilla.org.
-# Portions created by the Initial Developer are Copyright (C) 2005
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Vladimir Vukicevic <vladimir@pobox.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE = gfx
-LIBRARY_NAME = gkgfxthebes
-SHORT_LIBNAME = gkgfxthb
-EXPORT_LIBRARY = 1
-IS_COMPONENT = 1
-MODULE_NAME = nsGfxModule
-GRE_MODULE = 1
-LIBXUL_LIBRARY = 1
-
-
-CPPSRCS		= \
-		nsThebesDeviceContext.cpp \
-		nsThebesRegion.cpp \
-		nsThebesGfxFactory.cpp \
-		nsThebesRenderingContext.cpp \
-		nsThebesFontMetrics.cpp \
-		nsThebesFontEnumerator.cpp \
-		$(NULL)
-
-
-EXTRA_DSO_LIBS	= gkgfx thebes
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
-CPPSRCS += nsSystemFontsQt.cpp
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-CPPSRCS		+= nsSystemFontsGTK2.cpp
-
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-CPPSRCS		+= nsSystemFontsWin.cpp \
-		   $(NULL)
-
-ifndef WINCE
-_OS_LIBS	= usp10
-endif
-OS_LIBS		+= $(call EXPAND_LIBNAME,$(_OS_LIBS))
-
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
-CPPSRCS		+= nsSystemFontsOS2.cpp \
-		   $(NULL)
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
-CMMSRCS		= nsSystemFontsMac.mm
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),android)
-CPPSRCS		+= nsSystemFontsAndroid.cpp
-endif
-
-EXPORTS         += nsIThebesFontMetrics.h
-
-LOCAL_INCLUDES	= \
-		-I$(srcdir)/. \
-		-I$(srcdir)/.. \
-		-I$(srcdir)/../shared \
-		$(NULL)
-
-EXTRA_DSO_LDOPTS += \
-		$(LIBS_DIR) \
-		$(EXTRA_DSO_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(MOZ_UNICHARUTIL_LIBS) \
-		$(MOZ_JS_LIBS) \
-		$(TK_LIBS) \
-		$(NULL)
-
-ifdef MOZ_X11
-EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS)
-endif
-
-include $(topsrcdir)/config/rules.mk
-
-CXXFLAGS  += $(TK_CFLAGS) $(MOZ_CAIRO_CFLAGS)
-
-ifdef MOZ_ENABLE_GTK2
-DEFINES += -DMOZ_ENABLE_GTK2
-CXXFLAGS += $(MOZ_PANGO_CFLAGS)
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
-CXXFLAGS += $(CAIRO_FT_CFLAGS)
-endif
--- a/toolkit/library/libxul-config.mk
+++ b/toolkit/library/libxul-config.mk
@@ -111,17 +111,16 @@ ifneq (Android,$(OS_TARGET))
 OS_LIBS += -lrt
 endif
 endif
 endif
 
 STATIC_LIBS += \
 	xpcom_core \
 	ucvutil_s \
-	gkgfx \
 	$(NULL)
 
 ifdef MOZ_IPC
 STATIC_LIBS += chromium_s
 endif
 
 ifndef WINCE
 STATIC_LIBS += \
@@ -135,16 +134,17 @@ COMPONENT_LIBS += \
 	uconv \
 	i18n \
 	chardet \
 	jar$(VERSION_NUMBER) \
         startupcache \
 	pref \
 	htmlpars \
 	imglib2 \
+	gkgfx \
 	gklayout \
 	docshell \
 	embedcomponents \
 	webbrwsr \
 	nsappshell \
 	txmgr \
 	commandlines \
 	toolkitcomps \
@@ -295,18 +295,16 @@ endif
 ifeq ($(MOZ_WIDGET_TOOLKIT),android)
 COMPONENT_LIBS += widget_android
 endif
 
 STATIC_LIBS += thebes ycbcr
 
 STATIC_LIBS += angle
 
-COMPONENT_LIBS += gkgfxthebes
-
 ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
 COMPONENT_LIBS += gkwidget
 endif
 ifeq (os2,$(MOZ_WIDGET_TOOLKIT))
 COMPONENT_LIBS += wdgtos2
 endif
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 COMPONENT_LIBS += widget_mac
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -119,17 +119,16 @@ MAKEFILES_xmlparser="
   parser/xml/src/Makefile
 "
 
 MAKEFILES_gfx="
   gfx/Makefile
   gfx/ycbcr/Makefile
   gfx/layers/Makefile
   gfx/src/Makefile
-  gfx/src/thebes/Makefile
   gfx/tests/Makefile
   gfx/thebes/Makefile
   gfx/qcms/Makefile
   gfx/angle/Makefile
 "
 
 MAKEFILES_htmlparser="
   parser/htmlparser/Makefile