Bug 571989 part 3: Flatten directory structure below gfx/thebes.
authorZack Weinberg <zweinberg@mozilla.com>
Mon, 28 Jun 2010 10:37:23 -0700
changeset 46352 0e46aa941e64fa28b27c749685c0cd14f3573c52
parent 46351 6a6fbf66e1e01b945cfa1b59d2a9e7717504b8b1
child 46353 d1cbe16de6bf334c522b09ec2cee4cc17327a7c8
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)
bugs571989
milestone1.9.3a6pre
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 part 3: Flatten directory structure below gfx/thebes.
gfx/thebes/GLContext.cpp
gfx/thebes/GLContext.h
gfx/thebes/GLContextProvider.h
gfx/thebes/GLContextProviderCGL.mm
gfx/thebes/GLContextProviderEGL.cpp
gfx/thebes/GLContextProviderGLX.cpp
gfx/thebes/GLContextProviderNull.cpp
gfx/thebes/GLContextProviderOSMesa.cpp
gfx/thebes/GLContextProviderWGL.cpp
gfx/thebes/GLDefs.h
gfx/thebes/GLXLibrary.h
gfx/thebes/Makefile.in
gfx/thebes/WGLLibrary.h
gfx/thebes/cairo-gdk-utils.c
gfx/thebes/cairo-gdk-utils.h
gfx/thebes/cairo-xlib-utils.c
gfx/thebes/cairo-xlib-utils.h
gfx/thebes/genUnicodeScriptData.pl
gfx/thebes/gfx3DMatrix.h
gfx/thebes/gfxASurface.cpp
gfx/thebes/gfxASurface.h
gfx/thebes/gfxAlphaRecovery.cpp
gfx/thebes/gfxAlphaRecovery.h
gfx/thebes/gfxAndroidPlatform.cpp
gfx/thebes/gfxAndroidPlatform.h
gfx/thebes/gfxAtomList.h
gfx/thebes/gfxAtoms.cpp
gfx/thebes/gfxAtoms.h
gfx/thebes/gfxBeOSPlatform.cpp
gfx/thebes/gfxBeOSPlatform.h
gfx/thebes/gfxBeOSSurface.cpp
gfx/thebes/gfxBeOSSurface.h
gfx/thebes/gfxColor.h
gfx/thebes/gfxContext.cpp
gfx/thebes/gfxContext.h
gfx/thebes/gfxCoreTextShaper.cpp
gfx/thebes/gfxCoreTextShaper.h
gfx/thebes/gfxD2DSurface.cpp
gfx/thebes/gfxD2DSurface.h
gfx/thebes/gfxDDrawSurface.cpp
gfx/thebes/gfxDDrawSurface.h
gfx/thebes/gfxDWriteCommon.cpp
gfx/thebes/gfxDWriteCommon.h
gfx/thebes/gfxDWriteFontList.cpp
gfx/thebes/gfxDWriteFontList.h
gfx/thebes/gfxDWriteFonts.cpp
gfx/thebes/gfxDWriteFonts.h
gfx/thebes/gfxDWriteShaper.cpp
gfx/thebes/gfxDWriteShaper.h
gfx/thebes/gfxDWriteTextAnalysis.cpp
gfx/thebes/gfxDWriteTextAnalysis.h
gfx/thebes/gfxDirectFBSurface.cpp
gfx/thebes/gfxDirectFBSurface.h
gfx/thebes/gfxDllDeps.cpp
gfx/thebes/gfxFT2FontBase.cpp
gfx/thebes/gfxFT2FontBase.h
gfx/thebes/gfxFT2FontList.cpp
gfx/thebes/gfxFT2FontList.h
gfx/thebes/gfxFT2Fonts.cpp
gfx/thebes/gfxFT2Fonts.h
gfx/thebes/gfxFT2Utils.cpp
gfx/thebes/gfxFT2Utils.h
gfx/thebes/gfxFont.cpp
gfx/thebes/gfxFont.h
gfx/thebes/gfxFontConstants.h
gfx/thebes/gfxFontMissingGlyphs.cpp
gfx/thebes/gfxFontMissingGlyphs.h
gfx/thebes/gfxFontTest.cpp
gfx/thebes/gfxFontTest.h
gfx/thebes/gfxFontUtils.cpp
gfx/thebes/gfxFontUtils.h
gfx/thebes/gfxFontconfigUtils.cpp
gfx/thebes/gfxFontconfigUtils.h
gfx/thebes/gfxGDIFont.cpp
gfx/thebes/gfxGDIFont.h
gfx/thebes/gfxGDIFontList.cpp
gfx/thebes/gfxGDIFontList.h
gfx/thebes/gfxGDIShaper.cpp
gfx/thebes/gfxGDIShaper.h
gfx/thebes/gfxGdkNativeRenderer.cpp
gfx/thebes/gfxGdkNativeRenderer.h
gfx/thebes/gfxGlitzSurface.h
gfx/thebes/gfxHarfBuzzShaper.cpp
gfx/thebes/gfxHarfBuzzShaper.h
gfx/thebes/gfxImageSurface.cpp
gfx/thebes/gfxImageSurface.h
gfx/thebes/gfxMacFont.cpp
gfx/thebes/gfxMacFont.h
gfx/thebes/gfxMacPlatformFontList.h
gfx/thebes/gfxMacPlatformFontList.mm
gfx/thebes/gfxMatrix.cpp
gfx/thebes/gfxMatrix.h
gfx/thebes/gfxOS2Fonts.cpp
gfx/thebes/gfxOS2Fonts.h
gfx/thebes/gfxOS2Platform.cpp
gfx/thebes/gfxOS2Platform.h
gfx/thebes/gfxOS2Surface.cpp
gfx/thebes/gfxOS2Surface.h
gfx/thebes/gfxPDFSurface.cpp
gfx/thebes/gfxPDFSurface.h
gfx/thebes/gfxPSSurface.cpp
gfx/thebes/gfxPSSurface.h
gfx/thebes/gfxPangoFonts.cpp
gfx/thebes/gfxPangoFonts.h
gfx/thebes/gfxPath.cpp
gfx/thebes/gfxPath.h
gfx/thebes/gfxPattern.cpp
gfx/thebes/gfxPattern.h
gfx/thebes/gfxPlatform.cpp
gfx/thebes/gfxPlatform.h
gfx/thebes/gfxPlatformFontList.cpp
gfx/thebes/gfxPlatformFontList.h
gfx/thebes/gfxPlatformGtk.cpp
gfx/thebes/gfxPlatformGtk.h
gfx/thebes/gfxPlatformMac.cpp
gfx/thebes/gfxPlatformMac.h
gfx/thebes/gfxPoint.h
gfx/thebes/gfxQPainterSurface.cpp
gfx/thebes/gfxQPainterSurface.h
gfx/thebes/gfxQtNativeRenderer.cpp
gfx/thebes/gfxQtNativeRenderer.h
gfx/thebes/gfxQtPlatform.cpp
gfx/thebes/gfxQtPlatform.h
gfx/thebes/gfxQuartzImageSurface.cpp
gfx/thebes/gfxQuartzImageSurface.h
gfx/thebes/gfxQuartzNativeDrawing.cpp
gfx/thebes/gfxQuartzNativeDrawing.h
gfx/thebes/gfxQuartzPDFSurface.cpp
gfx/thebes/gfxQuartzPDFSurface.h
gfx/thebes/gfxQuartzSurface.cpp
gfx/thebes/gfxQuartzSurface.h
gfx/thebes/gfxRect.cpp
gfx/thebes/gfxRect.h
gfx/thebes/gfxScriptItemizer.cpp
gfx/thebes/gfxScriptItemizer.h
gfx/thebes/gfxSharedImageSurface.cpp
gfx/thebes/gfxSharedImageSurface.h
gfx/thebes/gfxSkipChars.cpp
gfx/thebes/gfxSkipChars.h
gfx/thebes/gfxTextRunCache.cpp
gfx/thebes/gfxTextRunCache.h
gfx/thebes/gfxTextRunWordCache.cpp
gfx/thebes/gfxTextRunWordCache.h
gfx/thebes/gfxTypes.h
gfx/thebes/gfxUnicodeProperties.cpp
gfx/thebes/gfxUnicodeProperties.h
gfx/thebes/gfxUnicodePropertyData.cpp
gfx/thebes/gfxUniscribeShaper.cpp
gfx/thebes/gfxUniscribeShaper.h
gfx/thebes/gfxUserFontSet.cpp
gfx/thebes/gfxUserFontSet.h
gfx/thebes/gfxUtils.cpp
gfx/thebes/gfxUtils.h
gfx/thebes/gfxWindowsNativeDrawing.cpp
gfx/thebes/gfxWindowsNativeDrawing.h
gfx/thebes/gfxWindowsPlatform.cpp
gfx/thebes/gfxWindowsPlatform.h
gfx/thebes/gfxWindowsSurface.cpp
gfx/thebes/gfxWindowsSurface.h
gfx/thebes/gfxXlibNativeRenderer.cpp
gfx/thebes/gfxXlibNativeRenderer.h
gfx/thebes/gfxXlibSurface.cpp
gfx/thebes/gfxXlibSurface.h
gfx/thebes/ignorable.x-ccmap
gfx/thebes/nsUnicodeRange.cpp
gfx/thebes/nsUnicodeRange.h
gfx/thebes/public/GLContext.h
gfx/thebes/public/GLContextProvider.h
gfx/thebes/public/GLDefs.h
gfx/thebes/public/GLXLibrary.h
gfx/thebes/public/Makefile.in
gfx/thebes/public/WGLLibrary.h
gfx/thebes/public/gfx3DMatrix.h
gfx/thebes/public/gfxASurface.h
gfx/thebes/public/gfxAlphaRecovery.h
gfx/thebes/public/gfxAndroidPlatform.h
gfx/thebes/public/gfxBeOSPlatform.h
gfx/thebes/public/gfxBeOSSurface.h
gfx/thebes/public/gfxColor.h
gfx/thebes/public/gfxContext.h
gfx/thebes/public/gfxD2DSurface.h
gfx/thebes/public/gfxDDrawSurface.h
gfx/thebes/public/gfxDWriteFonts.h
gfx/thebes/public/gfxDirectFBSurface.h
gfx/thebes/public/gfxFT2FontBase.h
gfx/thebes/public/gfxFT2Fonts.h
gfx/thebes/public/gfxFont.h
gfx/thebes/public/gfxFontConstants.h
gfx/thebes/public/gfxFontTest.h
gfx/thebes/public/gfxFontUtils.h
gfx/thebes/public/gfxGdkNativeRenderer.h
gfx/thebes/public/gfxGlitzSurface.h
gfx/thebes/public/gfxImageSurface.h
gfx/thebes/public/gfxMatrix.h
gfx/thebes/public/gfxOS2Fonts.h
gfx/thebes/public/gfxOS2Platform.h
gfx/thebes/public/gfxOS2Surface.h
gfx/thebes/public/gfxPDFSurface.h
gfx/thebes/public/gfxPSSurface.h
gfx/thebes/public/gfxPangoFonts.h
gfx/thebes/public/gfxPath.h
gfx/thebes/public/gfxPattern.h
gfx/thebes/public/gfxPlatform.h
gfx/thebes/public/gfxPlatformGtk.h
gfx/thebes/public/gfxPlatformMac.h
gfx/thebes/public/gfxPoint.h
gfx/thebes/public/gfxQPainterSurface.h
gfx/thebes/public/gfxQtNativeRenderer.h
gfx/thebes/public/gfxQtPlatform.h
gfx/thebes/public/gfxQuartzImageSurface.h
gfx/thebes/public/gfxQuartzNativeDrawing.h
gfx/thebes/public/gfxQuartzPDFSurface.h
gfx/thebes/public/gfxQuartzSurface.h
gfx/thebes/public/gfxRect.h
gfx/thebes/public/gfxSharedImageSurface.h
gfx/thebes/public/gfxSkipChars.h
gfx/thebes/public/gfxTextRunCache.h
gfx/thebes/public/gfxTextRunWordCache.h
gfx/thebes/public/gfxTypes.h
gfx/thebes/public/gfxUserFontSet.h
gfx/thebes/public/gfxUtils.h
gfx/thebes/public/gfxWindowsNativeDrawing.h
gfx/thebes/public/gfxWindowsPlatform.h
gfx/thebes/public/gfxWindowsSurface.h
gfx/thebes/public/gfxXlibNativeRenderer.h
gfx/thebes/public/gfxXlibSurface.h
gfx/thebes/src/GLContext.cpp
gfx/thebes/src/GLContextProviderCGL.mm
gfx/thebes/src/GLContextProviderEGL.cpp
gfx/thebes/src/GLContextProviderGLX.cpp
gfx/thebes/src/GLContextProviderNull.cpp
gfx/thebes/src/GLContextProviderOSMesa.cpp
gfx/thebes/src/GLContextProviderWGL.cpp
gfx/thebes/src/Makefile.in
gfx/thebes/src/cairo-gdk-utils.c
gfx/thebes/src/cairo-gdk-utils.h
gfx/thebes/src/cairo-xlib-utils.c
gfx/thebes/src/cairo-xlib-utils.h
gfx/thebes/src/genUnicodeScriptData.pl
gfx/thebes/src/gfxASurface.cpp
gfx/thebes/src/gfxAlphaRecovery.cpp
gfx/thebes/src/gfxAndroidPlatform.cpp
gfx/thebes/src/gfxAtomList.h
gfx/thebes/src/gfxAtoms.cpp
gfx/thebes/src/gfxAtoms.h
gfx/thebes/src/gfxBeOSPlatform.cpp
gfx/thebes/src/gfxBeOSSurface.cpp
gfx/thebes/src/gfxContext.cpp
gfx/thebes/src/gfxCoreTextShaper.cpp
gfx/thebes/src/gfxCoreTextShaper.h
gfx/thebes/src/gfxD2DSurface.cpp
gfx/thebes/src/gfxDDrawSurface.cpp
gfx/thebes/src/gfxDWriteCommon.cpp
gfx/thebes/src/gfxDWriteCommon.h
gfx/thebes/src/gfxDWriteFontList.cpp
gfx/thebes/src/gfxDWriteFontList.h
gfx/thebes/src/gfxDWriteFonts.cpp
gfx/thebes/src/gfxDWriteShaper.cpp
gfx/thebes/src/gfxDWriteShaper.h
gfx/thebes/src/gfxDWriteTextAnalysis.cpp
gfx/thebes/src/gfxDWriteTextAnalysis.h
gfx/thebes/src/gfxDirectFBSurface.cpp
gfx/thebes/src/gfxDllDeps.cpp
gfx/thebes/src/gfxFT2FontBase.cpp
gfx/thebes/src/gfxFT2FontList.cpp
gfx/thebes/src/gfxFT2FontList.h
gfx/thebes/src/gfxFT2Fonts.cpp
gfx/thebes/src/gfxFT2Utils.cpp
gfx/thebes/src/gfxFT2Utils.h
gfx/thebes/src/gfxFont.cpp
gfx/thebes/src/gfxFontMissingGlyphs.cpp
gfx/thebes/src/gfxFontMissingGlyphs.h
gfx/thebes/src/gfxFontTest.cpp
gfx/thebes/src/gfxFontUtils.cpp
gfx/thebes/src/gfxFontconfigUtils.cpp
gfx/thebes/src/gfxFontconfigUtils.h
gfx/thebes/src/gfxGDIFont.cpp
gfx/thebes/src/gfxGDIFont.h
gfx/thebes/src/gfxGDIFontList.cpp
gfx/thebes/src/gfxGDIFontList.h
gfx/thebes/src/gfxGDIShaper.cpp
gfx/thebes/src/gfxGDIShaper.h
gfx/thebes/src/gfxGdkNativeRenderer.cpp
gfx/thebes/src/gfxHarfBuzzShaper.cpp
gfx/thebes/src/gfxHarfBuzzShaper.h
gfx/thebes/src/gfxImageSurface.cpp
gfx/thebes/src/gfxMacFont.cpp
gfx/thebes/src/gfxMacFont.h
gfx/thebes/src/gfxMacPlatformFontList.h
gfx/thebes/src/gfxMacPlatformFontList.mm
gfx/thebes/src/gfxMatrix.cpp
gfx/thebes/src/gfxOS2Fonts.cpp
gfx/thebes/src/gfxOS2Platform.cpp
gfx/thebes/src/gfxOS2Surface.cpp
gfx/thebes/src/gfxPDFSurface.cpp
gfx/thebes/src/gfxPSSurface.cpp
gfx/thebes/src/gfxPangoFonts.cpp
gfx/thebes/src/gfxPath.cpp
gfx/thebes/src/gfxPattern.cpp
gfx/thebes/src/gfxPlatform.cpp
gfx/thebes/src/gfxPlatformFontList.cpp
gfx/thebes/src/gfxPlatformFontList.h
gfx/thebes/src/gfxPlatformGtk.cpp
gfx/thebes/src/gfxPlatformMac.cpp
gfx/thebes/src/gfxQPainterSurface.cpp
gfx/thebes/src/gfxQtNativeRenderer.cpp
gfx/thebes/src/gfxQtPlatform.cpp
gfx/thebes/src/gfxQuartzImageSurface.cpp
gfx/thebes/src/gfxQuartzNativeDrawing.cpp
gfx/thebes/src/gfxQuartzPDFSurface.cpp
gfx/thebes/src/gfxQuartzSurface.cpp
gfx/thebes/src/gfxRect.cpp
gfx/thebes/src/gfxScriptItemizer.cpp
gfx/thebes/src/gfxScriptItemizer.h
gfx/thebes/src/gfxSharedImageSurface.cpp
gfx/thebes/src/gfxSkipChars.cpp
gfx/thebes/src/gfxTextRunCache.cpp
gfx/thebes/src/gfxTextRunWordCache.cpp
gfx/thebes/src/gfxUnicodeProperties.cpp
gfx/thebes/src/gfxUnicodeProperties.h
gfx/thebes/src/gfxUnicodePropertyData.cpp
gfx/thebes/src/gfxUniscribeShaper.cpp
gfx/thebes/src/gfxUniscribeShaper.h
gfx/thebes/src/gfxUserFontSet.cpp
gfx/thebes/src/gfxUtils.cpp
gfx/thebes/src/gfxWindowsNativeDrawing.cpp
gfx/thebes/src/gfxWindowsPlatform.cpp
gfx/thebes/src/gfxWindowsSurface.cpp
gfx/thebes/src/gfxXlibNativeRenderer.cpp
gfx/thebes/src/gfxXlibSurface.cpp
gfx/thebes/src/ignorable.x-ccmap
gfx/thebes/src/nsUnicodeRange.cpp
gfx/thebes/src/nsUnicodeRange.h
gfx/thebes/src/woff-private.h
gfx/thebes/src/woff.c
gfx/thebes/src/woff.h
gfx/thebes/woff-private.h
gfx/thebes/woff.c
gfx/thebes/woff.h
rename from gfx/thebes/src/GLContext.cpp
rename to gfx/thebes/GLContext.cpp
rename from gfx/thebes/public/GLContext.h
rename to gfx/thebes/GLContext.h
rename from gfx/thebes/public/GLContextProvider.h
rename to gfx/thebes/GLContextProvider.h
rename from gfx/thebes/src/GLContextProviderCGL.mm
rename to gfx/thebes/GLContextProviderCGL.mm
rename from gfx/thebes/src/GLContextProviderEGL.cpp
rename to gfx/thebes/GLContextProviderEGL.cpp
rename from gfx/thebes/src/GLContextProviderGLX.cpp
rename to gfx/thebes/GLContextProviderGLX.cpp
rename from gfx/thebes/src/GLContextProviderNull.cpp
rename to gfx/thebes/GLContextProviderNull.cpp
rename from gfx/thebes/src/GLContextProviderOSMesa.cpp
rename to gfx/thebes/GLContextProviderOSMesa.cpp
rename from gfx/thebes/src/GLContextProviderWGL.cpp
rename to gfx/thebes/GLContextProviderWGL.cpp
rename from gfx/thebes/public/GLDefs.h
rename to gfx/thebes/GLDefs.h
rename from gfx/thebes/public/GLXLibrary.h
rename to gfx/thebes/GLXLibrary.h
--- a/gfx/thebes/Makefile.in
+++ b/gfx/thebes/Makefile.in
@@ -1,22 +1,448 @@
 
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE	= thebes
-
-DIRS	= public src
+MODULE		= thebes
+LIBRARY_NAME	= thebes
+LIBXUL_LIBRARY	= 1
+EXPORT_LIBRARY	= 1
 
 ifdef ENABLE_TESTS
-DIRS	+= mochitest
+DIRS = mochitest
 ifndef MOZ_ENABLE_LIBXUL
 ifndef BUILD_STATIC_LIBS
-TOOL_DIRS  += test
+TOOL_DIRS = test
 endif
 endif
 endif
 
+EXPORTS	= \
+	gfx3DMatrix.h \
+	gfxASurface.h \
+	gfxAlphaRecovery.h \
+	gfxColor.h \
+	gfxContext.h \
+	gfxFont.h \
+	gfxFontConstants.h \
+	gfxFontUtils.h \
+	gfxFontTest.h \
+	gfxImageSurface.h \
+	gfxMatrix.h \
+	gfxPath.h \
+	gfxPattern.h \
+	gfxPlatform.h \
+	gfxPoint.h \
+	gfxRect.h \
+	gfxSkipChars.h \
+	gfxTypes.h \
+	gfxTextRunCache.h \
+	gfxTextRunWordCache.h \
+	gfxUtils.h \
+	gfxUserFontSet.h \
+	GLDefs.h \
+	GLContext.h \
+	GLContextProvider.h \
+	$(NULL)
+
+ifdef MOZ_IPC
+EXPORTS	+= \
+	gfxSharedImageSurface.h \
+	$(NULL)
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),android)
+EXPORTS += \
+	gfxAndroidPlatform.h \
+	gfxFT2Fonts.h \
+	gfxFT2FontBase.h \
+	$(NULL)
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
+EXPORTS	+= \
+	gfxBeOSPlatform.h \
+	gfxBeOSSurface.h \
+	gfxFT2FontBase.h \
+	gfxPDFSurface.h \
+	gfxPangoFonts.h \
+	$(NULL)
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
+EXPORTS += \
+	gfxPlatformMac.h \
+	gfxQuartzSurface.h \
+	gfxQuartzImageSurface.h \
+	gfxQuartzPDFSurface.h \
+	gfxQuartzNativeDrawing.h \
+	$(NULL)
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+EXPORTS += \
+	gfxFT2FontBase.h \
+	gfxGdkNativeRenderer.h \
+	gfxPDFSurface.h \
+	gfxPSSurface.h \
+	gfxPlatformGtk.h \
+	$(NULL)
+
+ifdef MOZ_X11
+EXPORTS += \
+	gfxXlibSurface.h \
+	GLXLibrary.h \
+	$(NULL)
+endif
+
+ifdef MOZ_PANGO
+EXPORTS += gfxPangoFonts.h
+else
+EXPORTS += gfxFT2Fonts.h
+endif
+
+ifdef MOZ_DFB
+EXPORTS += gfxDirectFBSurface.h
+endif
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
+EXPORTS	+= \
+	gfxOS2Fonts.h \
+	gfxOS2Platform.h \
+	gfxOS2Surface.h \
+	gfxPDFSurface.h \
+	$(NULL)
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
+EXPORTS += \
+	gfxFT2FontBase.h \
+	gfxQPainterSurface.h \
+	gfxQtNativeRenderer.h \
+	gfxQtPlatform.h \
+	$(NULL)
+
+ifdef MOZ_X11
+EXPORTS += \
+	gfxXlibSurface.h \
+	GLXLibrary.h \
+	$(NULL)
+endif
+
+ifdef MOZ_PANGO
+EXPORTS += gfxPangoFonts.h
+else
+EXPORTS += gfxFT2Fonts.h
+endif
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
+EXPORTS	+= \
+	gfxPDFSurface.h \
+	gfxWindowsPlatform.h \
+	gfxWindowsSurface.h \
+	gfxWindowsNativeDrawing.h \
+	WGLLibrary.h \
+	$(NULL)
+
+ifdef WINCE
+EXPORTS += \
+	gfxFT2Fonts.h \
+	gfxFT2FontBase.h \
+	gfxDDrawSurface.h \
+	$(NULL)
+else
+EXPORTS += \
+	gfxDWriteFonts.h \
+	gfxD2DSurface.h \
+	$(NULL)
+endif
+endif
+
+CPPSRCS	= \
+	gfxASurface.cpp \
+	gfxAlphaRecovery.cpp \
+	gfxContext.cpp \
+	gfxImageSurface.cpp \
+	gfxFont.cpp \
+	gfxFontMissingGlyphs.cpp \
+	gfxFontTest.cpp \
+	gfxFontUtils.cpp \
+	gfxAtoms.cpp \
+	gfxMatrix.cpp \
+	gfxPath.cpp \
+	gfxPattern.cpp \
+	gfxPlatform.cpp \
+	gfxPlatformFontList.cpp \
+	gfxRect.cpp \
+	gfxSkipChars.cpp \
+	gfxTextRunCache.cpp \
+	gfxTextRunWordCache.cpp \
+	gfxUserFontSet.cpp \
+	gfxUtils.cpp \
+	gfxUnicodeProperties.cpp \
+	gfxScriptItemizer.cpp \
+	gfxHarfBuzzShaper.cpp \
+	GLContext.cpp \
+	GLContextProviderOSMesa.cpp \
+	$(NULL)
+
+ifdef MOZ_IPC
+CPPSRCS += \
+	gfxSharedImageSurface.cpp \
+	$(NULL)
+endif
+
+SHARED_LIBRARY_LIBS += \
+	../layers/$(LIB_PREFIX)layers.$(LIB_SUFFIX) \
+	$(NULL)
+
+
+ifndef MOZ_ENABLE_LIBXUL
+EXTRA_DSO_LIBS	= gkgfx ycbcr
+ifeq (,$(filter-out WINNT WINCE OS2,$(OS_ARCH)))
+CPPSRCS += gfxDllDeps.cpp
+endif
+endif
+
+EXTRA_DSO_LDOPTS += \
+	$(MOZ_CAIRO_LIBS) \
+	$(LIBS_DIR) \
+	$(EXTRA_DSO_LIBS) \
+	$(MOZ_UNICHARUTIL_LIBS) \
+	$(XPCOM_LIBS) \
+	$(NSPR_LIBS) \
+	$(ZLIB_LIBS) \
+	$(QCMS_LIBS) \
+	$(MOZ_HARFBUZZ_LIBS) \
+	$(NULL)
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
+CPPSRCS	+= 	gfxWindowsPlatform.cpp \
+		gfxWindowsSurface.cpp \
+		gfxWindowsNativeDrawing.cpp \
+		nsUnicodeRange.cpp \
+		$(NULL)
+
+ifdef WINCE
+CPPSRCS	+= gfxFT2Fonts.cpp \
+	   gfxFT2FontBase.cpp \
+	   gfxFT2Utils.cpp \
+	   gfxDDrawSurface.cpp \
+	   gfxFT2FontList.cpp \
+	   $(NULL)
+
+EXTRA_DSO_LDOPTS += $(FT2_LIBS)
+
+OS_LIBS += $(call EXPAND_LIBNAME,ddraw)
+else
+ifdef MOZ_ENABLE_DWRITE_FONT
+CPPSRCS	+= gfxDWriteFonts.cpp \
+	   gfxDWriteShaper.cpp \
+	   gfxDWriteTextAnalysis.cpp \
+	   gfxDWriteCommon.cpp \
+	   gfxD2DSurface.cpp \
+	   gfxDWriteFontList.cpp \
+	   $(NULL)
+endif
+CPPSRCS	+= gfxGDIFont.cpp \
+	   gfxGDIFontList.cpp \
+	   gfxGDIShaper.cpp \
+	   gfxUniscribeShaper.cpp \
+	   $(NULL)
+_OS_LIBS = usp10 msimg32
+endif
+
+CPPSRCS +=	gfxPDFSurface.cpp
+
+ifdef GNU_CXX
+_OS_LIBS	+= uuid
+endif
+OS_LIBS		+= $(call EXPAND_LIBNAME,$(_OS_LIBS))
+
+ifdef MOZ_ENABLE_D3D9_LAYER
+DEFINES +=	-DMOZ_ENABLE_D3D9_LAYER
+endif
+
+ACDEFINES +=	-UWIN32_LEAN_AND_MEAN
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),android)
+CPPSRCS += \
+	gfxAndroidPlatform.cpp \
+	gfxFT2Fonts.cpp \
+	gfxFT2FontBase.cpp \
+	gfxFT2Utils.cpp \
+	nsUnicodeRange.cpp \
+	$(NULL)
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
+CPPSRCS	+=	gfxOS2Fonts.cpp \
+		gfxOS2Platform.cpp \
+		gfxOS2Surface.cpp \
+		nsUnicodeRange.cpp \
+		gfxFontconfigUtils.cpp \
+		$(NULL)
+CPPSRCS +=	gfxPDFSurface.cpp
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+
+ifdef MOZ_PANGO
+CPPSRCS += gfxPangoFonts.cpp
+else
+CPPSRCS += gfxFT2Fonts.cpp
+endif
+
+ifdef MOZ_X11
+CPPSRCS += gfxXlibSurface.cpp
+endif
+
+CPPSRCS +=  gfxPlatformGtk.cpp gfxGdkNativeRenderer.cpp
+CPPSRCS +=	gfxPDFSurface.cpp gfxPSSurface.cpp
+CPPSRCS +=	gfxFontconfigUtils.cpp
+CPPSRCS +=	gfxFT2FontBase.cpp
+CPPSRCS +=	gfxFT2Utils.cpp
+CPPSRCS +=	nsUnicodeRange.cpp
+
+ifdef MOZ_X11
+CSRCS = cairo-xlib-utils.c
+endif
+
+ifdef MOZ_DFB
+CSRCS = cairo-gdk-utils.c
+endif
+
+EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS) $(ZLIB_LIBS) $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS)
+endif
+
+ifdef MOZ_DFB
+CPPSRCS += gfxDirectFBSurface.cpp
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
+CPPSRCS += gfxQtPlatform.cpp gfxQPainterSurface.cpp
+CPPSRCS += gfxXlibSurface.cpp gfxQtNativeRenderer.cpp
+ifdef MOZ_PANGO
+CPPSRCS += gfxPangoFonts.cpp
+else
+CPPSRCS += gfxFT2Fonts.cpp
+endif
+CPPSRCS +=	gfxFT2FontBase.cpp
+CPPSRCS +=	gfxFT2Utils.cpp
+CPPSRCS +=	gfxFontconfigUtils.cpp
+CPPSRCS +=	nsUnicodeRange.cpp
+#CSRCS = cairo-xlib-utils.c
+EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS) $(ZLIB_LIBS) $(XLDFLAGS) $(XLIBS) $(CAIRO_FT_LIBS) $(XEXT_LIBS)
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
+CPPSRCS	+= 	gfxBeOSSurface.cpp gfxBeOSPlatform.cpp
+CPPSRCS +=	gfxPangoFonts.cpp 
+CPPSRCS +=	gfxFT2FontBase.cpp
+CPPSRCS +=	gfxFT2Utils.cpp
+#CPPSRCS +=	gfxPDFSurface.cpp
+CPPSRCS +=	gfxFontconfigUtils.cpp
+CPPSRCS +=	nsUnicodeRange.cpp
+EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS) $(CAIRO_FT_LIBS) -lfontconfig
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
+CPPSRCS	+= \
+	gfxQuartzSurface.cpp \
+	gfxQuartzImageSurface.cpp \
+	gfxQuartzPDFSurface.cpp \
+	gfxPlatformMac.cpp \
+	gfxMacFont.cpp \
+	gfxCoreTextShaper.cpp \
+	$(NULL)
+#CPPSRCS +=	gfxPDFSurface.cpp
+CPPSRCS +=      nsUnicodeRange.cpp
+CPPSRCS +=      gfxQuartzNativeDrawing.cpp
+
+CMMSRCS = gfxMacPlatformFontList.mm
+
+# Always link with OpenGL/AGL
+EXTRA_DSO_LDOPTS += -framework OpenGL -framework AGL -framework QuickTime -framework AppKit
+endif
+
+CSRCS += woff.c
+
+EXTRA_DSO_LDOPTS += $(TK_LIBS)
+
+GL_PROVIDER = Null
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
+ifndef WINCE
+GL_PROVIDER = WGL
+endif
+endif
+
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
+GL_PROVIDER = CGL
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+ifdef MOZ_PLATFORM_MAEMO
+GL_PROVIDER = EGL
+else
+GL_PROVIDER = GLX
+endif
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
+GL_PROVIDER = EGL
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),android)
+GL_PROVIDER = EGL
+endif
+
+# Mac is a special snowflake
+ifeq ($(GL_PROVIDER),CGL)
+CMMSRCS += GLContextProvider$(GL_PROVIDER).mm
+else
+CPPSRCS += GLContextProvider$(GL_PROVIDER).cpp
+endif
+
+DEFINES += -DIMPL_THEBES -DWOFF_MOZILLA_CLIENT
+
 include $(topsrcdir)/config/rules.mk
+include $(topsrcdir)/ipc/chromium/chromium-config.mk
+
+DEFINES := $(filter-out -DUNICODE,$(DEFINES))
+
+CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)
+CFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
+ifdef WINCE
+CXXFLAGS += $(CAIRO_FT_CFLAGS)
+endif
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),android)
+CXXFLAGS += $(CAIRO_FT_CFLAGS)
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+CXXFLAGS += $(MOZ_PANGO_CFLAGS)
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
+CXXFLAGS += $(CAIRO_FT_CFLAGS)
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
+CXXFLAGS += $(CAIRO_FT_CFLAGS)
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
+CXXFLAGS += $(CAIRO_FT_CFLAGS) $(MOZ_PANGO_CFLAGS)
+endif
rename from gfx/thebes/public/WGLLibrary.h
rename to gfx/thebes/WGLLibrary.h
rename from gfx/thebes/src/cairo-gdk-utils.c
rename to gfx/thebes/cairo-gdk-utils.c
rename from gfx/thebes/src/cairo-gdk-utils.h
rename to gfx/thebes/cairo-gdk-utils.h
rename from gfx/thebes/src/cairo-xlib-utils.c
rename to gfx/thebes/cairo-xlib-utils.c
rename from gfx/thebes/src/cairo-xlib-utils.h
rename to gfx/thebes/cairo-xlib-utils.h
rename from gfx/thebes/src/genUnicodeScriptData.pl
rename to gfx/thebes/genUnicodeScriptData.pl
rename from gfx/thebes/public/gfx3DMatrix.h
rename to gfx/thebes/gfx3DMatrix.h
rename from gfx/thebes/src/gfxASurface.cpp
rename to gfx/thebes/gfxASurface.cpp
rename from gfx/thebes/public/gfxASurface.h
rename to gfx/thebes/gfxASurface.h
rename from gfx/thebes/src/gfxAlphaRecovery.cpp
rename to gfx/thebes/gfxAlphaRecovery.cpp
rename from gfx/thebes/public/gfxAlphaRecovery.h
rename to gfx/thebes/gfxAlphaRecovery.h
rename from gfx/thebes/src/gfxAndroidPlatform.cpp
rename to gfx/thebes/gfxAndroidPlatform.cpp
rename from gfx/thebes/public/gfxAndroidPlatform.h
rename to gfx/thebes/gfxAndroidPlatform.h
rename from gfx/thebes/src/gfxAtomList.h
rename to gfx/thebes/gfxAtomList.h
rename from gfx/thebes/src/gfxAtoms.cpp
rename to gfx/thebes/gfxAtoms.cpp
rename from gfx/thebes/src/gfxAtoms.h
rename to gfx/thebes/gfxAtoms.h
rename from gfx/thebes/src/gfxBeOSPlatform.cpp
rename to gfx/thebes/gfxBeOSPlatform.cpp
rename from gfx/thebes/public/gfxBeOSPlatform.h
rename to gfx/thebes/gfxBeOSPlatform.h
rename from gfx/thebes/src/gfxBeOSSurface.cpp
rename to gfx/thebes/gfxBeOSSurface.cpp
rename from gfx/thebes/public/gfxBeOSSurface.h
rename to gfx/thebes/gfxBeOSSurface.h
rename from gfx/thebes/public/gfxColor.h
rename to gfx/thebes/gfxColor.h
rename from gfx/thebes/src/gfxContext.cpp
rename to gfx/thebes/gfxContext.cpp
rename from gfx/thebes/public/gfxContext.h
rename to gfx/thebes/gfxContext.h
rename from gfx/thebes/src/gfxCoreTextShaper.cpp
rename to gfx/thebes/gfxCoreTextShaper.cpp
rename from gfx/thebes/src/gfxCoreTextShaper.h
rename to gfx/thebes/gfxCoreTextShaper.h
rename from gfx/thebes/src/gfxD2DSurface.cpp
rename to gfx/thebes/gfxD2DSurface.cpp
rename from gfx/thebes/public/gfxD2DSurface.h
rename to gfx/thebes/gfxD2DSurface.h
rename from gfx/thebes/src/gfxDDrawSurface.cpp
rename to gfx/thebes/gfxDDrawSurface.cpp
rename from gfx/thebes/public/gfxDDrawSurface.h
rename to gfx/thebes/gfxDDrawSurface.h
rename from gfx/thebes/src/gfxDWriteCommon.cpp
rename to gfx/thebes/gfxDWriteCommon.cpp
rename from gfx/thebes/src/gfxDWriteCommon.h
rename to gfx/thebes/gfxDWriteCommon.h
rename from gfx/thebes/src/gfxDWriteFontList.cpp
rename to gfx/thebes/gfxDWriteFontList.cpp
rename from gfx/thebes/src/gfxDWriteFontList.h
rename to gfx/thebes/gfxDWriteFontList.h
rename from gfx/thebes/src/gfxDWriteFonts.cpp
rename to gfx/thebes/gfxDWriteFonts.cpp
rename from gfx/thebes/public/gfxDWriteFonts.h
rename to gfx/thebes/gfxDWriteFonts.h
rename from gfx/thebes/src/gfxDWriteShaper.cpp
rename to gfx/thebes/gfxDWriteShaper.cpp
rename from gfx/thebes/src/gfxDWriteShaper.h
rename to gfx/thebes/gfxDWriteShaper.h
rename from gfx/thebes/src/gfxDWriteTextAnalysis.cpp
rename to gfx/thebes/gfxDWriteTextAnalysis.cpp
rename from gfx/thebes/src/gfxDWriteTextAnalysis.h
rename to gfx/thebes/gfxDWriteTextAnalysis.h
rename from gfx/thebes/src/gfxDirectFBSurface.cpp
rename to gfx/thebes/gfxDirectFBSurface.cpp
rename from gfx/thebes/public/gfxDirectFBSurface.h
rename to gfx/thebes/gfxDirectFBSurface.h
rename from gfx/thebes/src/gfxDllDeps.cpp
rename to gfx/thebes/gfxDllDeps.cpp
rename from gfx/thebes/src/gfxFT2FontBase.cpp
rename to gfx/thebes/gfxFT2FontBase.cpp
rename from gfx/thebes/public/gfxFT2FontBase.h
rename to gfx/thebes/gfxFT2FontBase.h
rename from gfx/thebes/src/gfxFT2FontList.cpp
rename to gfx/thebes/gfxFT2FontList.cpp
rename from gfx/thebes/src/gfxFT2FontList.h
rename to gfx/thebes/gfxFT2FontList.h
rename from gfx/thebes/src/gfxFT2Fonts.cpp
rename to gfx/thebes/gfxFT2Fonts.cpp
rename from gfx/thebes/public/gfxFT2Fonts.h
rename to gfx/thebes/gfxFT2Fonts.h
rename from gfx/thebes/src/gfxFT2Utils.cpp
rename to gfx/thebes/gfxFT2Utils.cpp
rename from gfx/thebes/src/gfxFT2Utils.h
rename to gfx/thebes/gfxFT2Utils.h
rename from gfx/thebes/src/gfxFont.cpp
rename to gfx/thebes/gfxFont.cpp
rename from gfx/thebes/public/gfxFont.h
rename to gfx/thebes/gfxFont.h
rename from gfx/thebes/public/gfxFontConstants.h
rename to gfx/thebes/gfxFontConstants.h
rename from gfx/thebes/src/gfxFontMissingGlyphs.cpp
rename to gfx/thebes/gfxFontMissingGlyphs.cpp
rename from gfx/thebes/src/gfxFontMissingGlyphs.h
rename to gfx/thebes/gfxFontMissingGlyphs.h
rename from gfx/thebes/src/gfxFontTest.cpp
rename to gfx/thebes/gfxFontTest.cpp
rename from gfx/thebes/public/gfxFontTest.h
rename to gfx/thebes/gfxFontTest.h
rename from gfx/thebes/src/gfxFontUtils.cpp
rename to gfx/thebes/gfxFontUtils.cpp
rename from gfx/thebes/public/gfxFontUtils.h
rename to gfx/thebes/gfxFontUtils.h
rename from gfx/thebes/src/gfxFontconfigUtils.cpp
rename to gfx/thebes/gfxFontconfigUtils.cpp
rename from gfx/thebes/src/gfxFontconfigUtils.h
rename to gfx/thebes/gfxFontconfigUtils.h
rename from gfx/thebes/src/gfxGDIFont.cpp
rename to gfx/thebes/gfxGDIFont.cpp
rename from gfx/thebes/src/gfxGDIFont.h
rename to gfx/thebes/gfxGDIFont.h
rename from gfx/thebes/src/gfxGDIFontList.cpp
rename to gfx/thebes/gfxGDIFontList.cpp
rename from gfx/thebes/src/gfxGDIFontList.h
rename to gfx/thebes/gfxGDIFontList.h
rename from gfx/thebes/src/gfxGDIShaper.cpp
rename to gfx/thebes/gfxGDIShaper.cpp
rename from gfx/thebes/src/gfxGDIShaper.h
rename to gfx/thebes/gfxGDIShaper.h
rename from gfx/thebes/src/gfxGdkNativeRenderer.cpp
rename to gfx/thebes/gfxGdkNativeRenderer.cpp
rename from gfx/thebes/public/gfxGdkNativeRenderer.h
rename to gfx/thebes/gfxGdkNativeRenderer.h
rename from gfx/thebes/public/gfxGlitzSurface.h
rename to gfx/thebes/gfxGlitzSurface.h
rename from gfx/thebes/src/gfxHarfBuzzShaper.cpp
rename to gfx/thebes/gfxHarfBuzzShaper.cpp
rename from gfx/thebes/src/gfxHarfBuzzShaper.h
rename to gfx/thebes/gfxHarfBuzzShaper.h
rename from gfx/thebes/src/gfxImageSurface.cpp
rename to gfx/thebes/gfxImageSurface.cpp
rename from gfx/thebes/public/gfxImageSurface.h
rename to gfx/thebes/gfxImageSurface.h
rename from gfx/thebes/src/gfxMacFont.cpp
rename to gfx/thebes/gfxMacFont.cpp
rename from gfx/thebes/src/gfxMacFont.h
rename to gfx/thebes/gfxMacFont.h
rename from gfx/thebes/src/gfxMacPlatformFontList.h
rename to gfx/thebes/gfxMacPlatformFontList.h
rename from gfx/thebes/src/gfxMacPlatformFontList.mm
rename to gfx/thebes/gfxMacPlatformFontList.mm
rename from gfx/thebes/src/gfxMatrix.cpp
rename to gfx/thebes/gfxMatrix.cpp
rename from gfx/thebes/public/gfxMatrix.h
rename to gfx/thebes/gfxMatrix.h
rename from gfx/thebes/src/gfxOS2Fonts.cpp
rename to gfx/thebes/gfxOS2Fonts.cpp
rename from gfx/thebes/public/gfxOS2Fonts.h
rename to gfx/thebes/gfxOS2Fonts.h
rename from gfx/thebes/src/gfxOS2Platform.cpp
rename to gfx/thebes/gfxOS2Platform.cpp
rename from gfx/thebes/public/gfxOS2Platform.h
rename to gfx/thebes/gfxOS2Platform.h
rename from gfx/thebes/src/gfxOS2Surface.cpp
rename to gfx/thebes/gfxOS2Surface.cpp
rename from gfx/thebes/public/gfxOS2Surface.h
rename to gfx/thebes/gfxOS2Surface.h
rename from gfx/thebes/src/gfxPDFSurface.cpp
rename to gfx/thebes/gfxPDFSurface.cpp
rename from gfx/thebes/public/gfxPDFSurface.h
rename to gfx/thebes/gfxPDFSurface.h
rename from gfx/thebes/src/gfxPSSurface.cpp
rename to gfx/thebes/gfxPSSurface.cpp
rename from gfx/thebes/public/gfxPSSurface.h
rename to gfx/thebes/gfxPSSurface.h
rename from gfx/thebes/src/gfxPangoFonts.cpp
rename to gfx/thebes/gfxPangoFonts.cpp
rename from gfx/thebes/public/gfxPangoFonts.h
rename to gfx/thebes/gfxPangoFonts.h
rename from gfx/thebes/src/gfxPath.cpp
rename to gfx/thebes/gfxPath.cpp
rename from gfx/thebes/public/gfxPath.h
rename to gfx/thebes/gfxPath.h
rename from gfx/thebes/src/gfxPattern.cpp
rename to gfx/thebes/gfxPattern.cpp
rename from gfx/thebes/public/gfxPattern.h
rename to gfx/thebes/gfxPattern.h
rename from gfx/thebes/src/gfxPlatform.cpp
rename to gfx/thebes/gfxPlatform.cpp
rename from gfx/thebes/public/gfxPlatform.h
rename to gfx/thebes/gfxPlatform.h
rename from gfx/thebes/src/gfxPlatformFontList.cpp
rename to gfx/thebes/gfxPlatformFontList.cpp
rename from gfx/thebes/src/gfxPlatformFontList.h
rename to gfx/thebes/gfxPlatformFontList.h
rename from gfx/thebes/src/gfxPlatformGtk.cpp
rename to gfx/thebes/gfxPlatformGtk.cpp
rename from gfx/thebes/public/gfxPlatformGtk.h
rename to gfx/thebes/gfxPlatformGtk.h
rename from gfx/thebes/src/gfxPlatformMac.cpp
rename to gfx/thebes/gfxPlatformMac.cpp
rename from gfx/thebes/public/gfxPlatformMac.h
rename to gfx/thebes/gfxPlatformMac.h
rename from gfx/thebes/public/gfxPoint.h
rename to gfx/thebes/gfxPoint.h
rename from gfx/thebes/src/gfxQPainterSurface.cpp
rename to gfx/thebes/gfxQPainterSurface.cpp
rename from gfx/thebes/public/gfxQPainterSurface.h
rename to gfx/thebes/gfxQPainterSurface.h
rename from gfx/thebes/src/gfxQtNativeRenderer.cpp
rename to gfx/thebes/gfxQtNativeRenderer.cpp
rename from gfx/thebes/public/gfxQtNativeRenderer.h
rename to gfx/thebes/gfxQtNativeRenderer.h
rename from gfx/thebes/src/gfxQtPlatform.cpp
rename to gfx/thebes/gfxQtPlatform.cpp
rename from gfx/thebes/public/gfxQtPlatform.h
rename to gfx/thebes/gfxQtPlatform.h
rename from gfx/thebes/src/gfxQuartzImageSurface.cpp
rename to gfx/thebes/gfxQuartzImageSurface.cpp
rename from gfx/thebes/public/gfxQuartzImageSurface.h
rename to gfx/thebes/gfxQuartzImageSurface.h
rename from gfx/thebes/src/gfxQuartzNativeDrawing.cpp
rename to gfx/thebes/gfxQuartzNativeDrawing.cpp
rename from gfx/thebes/public/gfxQuartzNativeDrawing.h
rename to gfx/thebes/gfxQuartzNativeDrawing.h
rename from gfx/thebes/src/gfxQuartzPDFSurface.cpp
rename to gfx/thebes/gfxQuartzPDFSurface.cpp
rename from gfx/thebes/public/gfxQuartzPDFSurface.h
rename to gfx/thebes/gfxQuartzPDFSurface.h
rename from gfx/thebes/src/gfxQuartzSurface.cpp
rename to gfx/thebes/gfxQuartzSurface.cpp
rename from gfx/thebes/public/gfxQuartzSurface.h
rename to gfx/thebes/gfxQuartzSurface.h
rename from gfx/thebes/src/gfxRect.cpp
rename to gfx/thebes/gfxRect.cpp
rename from gfx/thebes/public/gfxRect.h
rename to gfx/thebes/gfxRect.h
rename from gfx/thebes/src/gfxScriptItemizer.cpp
rename to gfx/thebes/gfxScriptItemizer.cpp
rename from gfx/thebes/src/gfxScriptItemizer.h
rename to gfx/thebes/gfxScriptItemizer.h
rename from gfx/thebes/src/gfxSharedImageSurface.cpp
rename to gfx/thebes/gfxSharedImageSurface.cpp
rename from gfx/thebes/public/gfxSharedImageSurface.h
rename to gfx/thebes/gfxSharedImageSurface.h
rename from gfx/thebes/src/gfxSkipChars.cpp
rename to gfx/thebes/gfxSkipChars.cpp
rename from gfx/thebes/public/gfxSkipChars.h
rename to gfx/thebes/gfxSkipChars.h
rename from gfx/thebes/src/gfxTextRunCache.cpp
rename to gfx/thebes/gfxTextRunCache.cpp
rename from gfx/thebes/public/gfxTextRunCache.h
rename to gfx/thebes/gfxTextRunCache.h
rename from gfx/thebes/src/gfxTextRunWordCache.cpp
rename to gfx/thebes/gfxTextRunWordCache.cpp
rename from gfx/thebes/public/gfxTextRunWordCache.h
rename to gfx/thebes/gfxTextRunWordCache.h
rename from gfx/thebes/public/gfxTypes.h
rename to gfx/thebes/gfxTypes.h
rename from gfx/thebes/src/gfxUnicodeProperties.cpp
rename to gfx/thebes/gfxUnicodeProperties.cpp
rename from gfx/thebes/src/gfxUnicodeProperties.h
rename to gfx/thebes/gfxUnicodeProperties.h
rename from gfx/thebes/src/gfxUnicodePropertyData.cpp
rename to gfx/thebes/gfxUnicodePropertyData.cpp
rename from gfx/thebes/src/gfxUniscribeShaper.cpp
rename to gfx/thebes/gfxUniscribeShaper.cpp
rename from gfx/thebes/src/gfxUniscribeShaper.h
rename to gfx/thebes/gfxUniscribeShaper.h
rename from gfx/thebes/src/gfxUserFontSet.cpp
rename to gfx/thebes/gfxUserFontSet.cpp
rename from gfx/thebes/public/gfxUserFontSet.h
rename to gfx/thebes/gfxUserFontSet.h
rename from gfx/thebes/src/gfxUtils.cpp
rename to gfx/thebes/gfxUtils.cpp
rename from gfx/thebes/public/gfxUtils.h
rename to gfx/thebes/gfxUtils.h
rename from gfx/thebes/src/gfxWindowsNativeDrawing.cpp
rename to gfx/thebes/gfxWindowsNativeDrawing.cpp
rename from gfx/thebes/public/gfxWindowsNativeDrawing.h
rename to gfx/thebes/gfxWindowsNativeDrawing.h
rename from gfx/thebes/src/gfxWindowsPlatform.cpp
rename to gfx/thebes/gfxWindowsPlatform.cpp
rename from gfx/thebes/public/gfxWindowsPlatform.h
rename to gfx/thebes/gfxWindowsPlatform.h
rename from gfx/thebes/src/gfxWindowsSurface.cpp
rename to gfx/thebes/gfxWindowsSurface.cpp
rename from gfx/thebes/public/gfxWindowsSurface.h
rename to gfx/thebes/gfxWindowsSurface.h
rename from gfx/thebes/src/gfxXlibNativeRenderer.cpp
rename to gfx/thebes/gfxXlibNativeRenderer.cpp
rename from gfx/thebes/public/gfxXlibNativeRenderer.h
rename to gfx/thebes/gfxXlibNativeRenderer.h
rename from gfx/thebes/src/gfxXlibSurface.cpp
rename to gfx/thebes/gfxXlibSurface.cpp
rename from gfx/thebes/public/gfxXlibSurface.h
rename to gfx/thebes/gfxXlibSurface.h
rename from gfx/thebes/src/ignorable.x-ccmap
rename to gfx/thebes/ignorable.x-ccmap
rename from gfx/thebes/src/nsUnicodeRange.cpp
rename to gfx/thebes/nsUnicodeRange.cpp
rename from gfx/thebes/src/nsUnicodeRange.h
rename to gfx/thebes/nsUnicodeRange.h
deleted file mode 100644
--- a/gfx/thebes/public/Makefile.in
+++ /dev/null
@@ -1,141 +0,0 @@
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= thebes
-
-
-EXPORTS		= 	gfx3DMatrix.h \
-			gfxASurface.h \
-			gfxAlphaRecovery.h \
-			gfxColor.h \
-			gfxContext.h \
-			gfxFont.h \
-			gfxFontConstants.h \
-			gfxFontUtils.h \
-			gfxImageSurface.h \
-			gfxMatrix.h \
-			gfxPath.h \
-			gfxPattern.h \
-			gfxPlatform.h \
-			gfxPoint.h \
-			gfxRect.h \
-			gfxSkipChars.h \
-			gfxTypes.h \
-			gfxTextRunCache.h \
-			gfxTextRunWordCache.h \
-			gfxUtils.h \
-			gfxUserFontSet.h \
-			GLDefs.h \
-			GLContext.h \
-			GLContextProvider.h \
-			$(NULL)
-
-ifdef MOZ_IPC
-EXPORTS		+= \
-			gfxSharedImageSurface.h \
-			$(NULL)
-endif
-
-EXPORTS += gfxFontTest.h
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-EXPORTS	+=	gfxWindowsPlatform.h \
-		gfxWindowsSurface.h \
-		gfxWindowsNativeDrawing.h \
-		WGLLibrary.h \
-		$(NULL)
-EXPORTS +=	gfxPDFSurface.h
-
-ifdef WINCE
-EXPORTS +=	gfxFT2Fonts.h \
-		gfxFT2FontBase.h \
-		gfxDDrawSurface.h \
-		$(NULL)
-else
-EXPORTS +=  gfxDWriteFonts.h
-EXPORTS +=  gfxD2DSurface.h
-endif
-
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),android)
-EXPORTS += \
-	gfxAndroidPlatform.h \
-	gfxFT2Fonts.h \
-	gfxFT2FontBase.h \
-	$(NULL)
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-
-ifdef MOZ_X11
-EXPORTS += gfxXlibSurface.h \
-           GLXLibrary.h \
-           $(NULL)
-endif
-
-ifdef MOZ_PANGO 
-EXPORTS += gfxPangoFonts.h
-else
-EXPORTS += gfxFT2Fonts.h
-endif
-
-ifdef MOZ_DFB
-EXPORTS += gfxDirectFBSurface.h
-endif
-
-EXPORTS += gfxPlatformGtk.h gfxGdkNativeRenderer.h
-EXPORTS += gfxPDFSurface.h gfxPSSurface.h
-EXPORTS += gfxFT2FontBase.h
-
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
-
-ifdef MOZ_X11
-EXPORTS += gfxXlibSurface.h \
-           GLXLibrary.h \
-           $(NULL)
-endif
-
-ifdef MOZ_PANGO
-EXPORTS += gfxPangoFonts.h
-else
-EXPORTS += gfxFT2Fonts.h
-endif
-EXPORTS += gfxQtPlatform.h gfxQPainterSurface.h
-EXPORTS += gfxXlibSurface.h gfxQtNativeRenderer.h
-EXPORTS += gfxFT2FontBase.h
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
-EXPORTS	+=	gfxOS2Surface.h \
-		gfxOS2Platform.h \
-		gfxOS2Fonts.h \
-		$(NULL)
-EXPORTS +=	gfxPDFSurface.h
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
-EXPORTS	+=	gfxBeOSSurface.h gfxBeOSPlatform.h
-EXPORTS +=	gfxPangoFonts.h
-EXPORTS +=	gfxFT2FontBase.h
-EXPORTS +=	gfxPDFSurface.h
-endif
-
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-EXPORTS +=	gfxPlatformMac.h \
-		gfxQuartzSurface.h \
-		gfxQuartzImageSurface.h \
-		gfxQuartzPDFSurface.h \
-		gfxQuartzNativeDrawing.h \
-		$(NULL)
-
-endif
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/gfx/thebes/src/Makefile.in
+++ /dev/null
@@ -1,300 +0,0 @@
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= thebes
-LIBRARY_NAME	= thebes
-LIBXUL_LIBRARY	= 1
-EXPORT_LIBRARY	= 1
-
-
-CPPSRCS	= \
-	gfxASurface.cpp \
-	gfxAlphaRecovery.cpp \
-	gfxContext.cpp \
-	gfxImageSurface.cpp \
-	gfxFont.cpp \
-	gfxFontMissingGlyphs.cpp \
-	gfxFontTest.cpp \
-	gfxFontUtils.cpp \
-	gfxAtoms.cpp \
-	gfxMatrix.cpp \
-	gfxPath.cpp \
-	gfxPattern.cpp \
-	gfxPlatform.cpp \
-	gfxPlatformFontList.cpp \
-	gfxRect.cpp \
-	gfxSkipChars.cpp \
-	gfxTextRunCache.cpp \
-	gfxTextRunWordCache.cpp \
-	gfxUserFontSet.cpp \
-	gfxUtils.cpp \
-	gfxUnicodeProperties.cpp \
-	gfxScriptItemizer.cpp \
-	gfxHarfBuzzShaper.cpp \
-	GLContext.cpp \
-	GLContextProviderOSMesa.cpp \
-	$(NULL)
-
-ifdef MOZ_IPC
-CPPSRCS += \
-	gfxSharedImageSurface.cpp \
-	$(NULL)
-endif
-
-SHARED_LIBRARY_LIBS += \
-	../../layers/$(LIB_PREFIX)layers.$(LIB_SUFFIX) \
-	$(NULL)
-
-
-ifndef MOZ_ENABLE_LIBXUL
-EXTRA_DSO_LIBS	= gkgfx ycbcr
-ifeq (,$(filter-out WINNT WINCE OS2,$(OS_ARCH)))
-CPPSRCS += gfxDllDeps.cpp
-endif
-endif
-
-EXTRA_DSO_LDOPTS += \
-	$(MOZ_CAIRO_LIBS) \
-	$(LIBS_DIR) \
-	$(EXTRA_DSO_LIBS) \
-	$(MOZ_UNICHARUTIL_LIBS) \
-	$(XPCOM_LIBS) \
-	$(NSPR_LIBS) \
-	$(ZLIB_LIBS) \
-	$(QCMS_LIBS) \
-	$(MOZ_HARFBUZZ_LIBS) \
-	$(NULL)
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-CPPSRCS	+= 	gfxWindowsPlatform.cpp \
-		gfxWindowsSurface.cpp \
-		gfxWindowsNativeDrawing.cpp \
-		nsUnicodeRange.cpp \
-		$(NULL)
-
-ifdef WINCE
-CPPSRCS	+= gfxFT2Fonts.cpp \
-	   gfxFT2FontBase.cpp \
-	   gfxFT2Utils.cpp \
-	   gfxDDrawSurface.cpp \
-	   gfxFT2FontList.cpp \
-	   $(NULL)
-
-EXTRA_DSO_LDOPTS += $(FT2_LIBS)
-
-OS_LIBS += $(call EXPAND_LIBNAME,ddraw)
-else
-ifdef MOZ_ENABLE_DWRITE_FONT
-CPPSRCS	+= gfxDWriteFonts.cpp \
-	   gfxDWriteShaper.cpp \
-	   gfxDWriteTextAnalysis.cpp \
-	   gfxDWriteCommon.cpp \
-	   gfxD2DSurface.cpp \
-	   gfxDWriteFontList.cpp \
-	   $(NULL)
-endif
-CPPSRCS	+= gfxGDIFont.cpp \
-	   gfxGDIFontList.cpp \
-	   gfxGDIShaper.cpp \
-	   gfxUniscribeShaper.cpp \
-	   $(NULL)
-_OS_LIBS = usp10 msimg32
-endif
-
-CPPSRCS +=	gfxPDFSurface.cpp
-
-ifdef GNU_CXX
-_OS_LIBS	+= uuid
-endif
-OS_LIBS		+= $(call EXPAND_LIBNAME,$(_OS_LIBS))
-
-ifdef MOZ_ENABLE_D3D9_LAYER
-DEFINES +=	-DMOZ_ENABLE_D3D9_LAYER
-endif
-
-ACDEFINES +=	-UWIN32_LEAN_AND_MEAN
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),android)
-CPPSRCS += \
-	gfxAndroidPlatform.cpp \
-	gfxFT2Fonts.cpp \
-	gfxFT2FontBase.cpp \
-	gfxFT2Utils.cpp \
-	nsUnicodeRange.cpp \
-	$(NULL)
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
-CPPSRCS	+=	gfxOS2Fonts.cpp \
-		gfxOS2Platform.cpp \
-		gfxOS2Surface.cpp \
-		nsUnicodeRange.cpp \
-		gfxFontconfigUtils.cpp \
-		$(NULL)
-CPPSRCS +=	gfxPDFSurface.cpp
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-
-ifdef MOZ_PANGO
-CPPSRCS += gfxPangoFonts.cpp
-else
-CPPSRCS += gfxFT2Fonts.cpp
-endif
-
-ifdef MOZ_X11
-CPPSRCS += gfxXlibSurface.cpp
-endif
-
-CPPSRCS +=  gfxPlatformGtk.cpp gfxGdkNativeRenderer.cpp
-CPPSRCS +=	gfxPDFSurface.cpp gfxPSSurface.cpp
-CPPSRCS +=	gfxFontconfigUtils.cpp
-CPPSRCS +=	gfxFT2FontBase.cpp
-CPPSRCS +=	gfxFT2Utils.cpp
-CPPSRCS +=	nsUnicodeRange.cpp
-
-ifdef MOZ_X11
-CSRCS = cairo-xlib-utils.c
-endif
-
-ifdef MOZ_DFB
-CSRCS = cairo-gdk-utils.c
-endif
-
-EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS) $(ZLIB_LIBS) $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS)
-endif
-
-ifdef MOZ_DFB
-CPPSRCS += gfxDirectFBSurface.cpp
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
-CPPSRCS += gfxQtPlatform.cpp gfxQPainterSurface.cpp
-CPPSRCS += gfxXlibSurface.cpp gfxQtNativeRenderer.cpp
-ifdef MOZ_PANGO
-CPPSRCS += gfxPangoFonts.cpp
-else
-CPPSRCS += gfxFT2Fonts.cpp
-endif
-CPPSRCS +=	gfxFT2FontBase.cpp
-CPPSRCS +=	gfxFT2Utils.cpp
-CPPSRCS +=	gfxFontconfigUtils.cpp
-CPPSRCS +=	nsUnicodeRange.cpp
-#CSRCS = cairo-xlib-utils.c
-EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS) $(ZLIB_LIBS) $(XLDFLAGS) $(XLIBS) $(CAIRO_FT_LIBS) $(XEXT_LIBS)
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
-CPPSRCS	+= 	gfxBeOSSurface.cpp gfxBeOSPlatform.cpp
-CPPSRCS +=	gfxPangoFonts.cpp 
-CPPSRCS +=	gfxFT2FontBase.cpp
-CPPSRCS +=	gfxFT2Utils.cpp
-#CPPSRCS +=	gfxPDFSurface.cpp
-CPPSRCS +=	gfxFontconfigUtils.cpp
-CPPSRCS +=	nsUnicodeRange.cpp
-EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS) $(CAIRO_FT_LIBS) -lfontconfig
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
-CPPSRCS	+= \
-	gfxQuartzSurface.cpp \
-	gfxQuartzImageSurface.cpp \
-	gfxQuartzPDFSurface.cpp \
-	gfxPlatformMac.cpp \
-	gfxMacFont.cpp \
-	gfxCoreTextShaper.cpp \
-	$(NULL)
-#CPPSRCS +=	gfxPDFSurface.cpp
-CPPSRCS +=      nsUnicodeRange.cpp
-CPPSRCS +=      gfxQuartzNativeDrawing.cpp
-
-CMMSRCS = gfxMacPlatformFontList.mm
-
-# Always link with OpenGL/AGL
-EXTRA_DSO_LDOPTS += -framework OpenGL -framework AGL -framework QuickTime -framework AppKit
-endif
-
-CSRCS += woff.c
-
-EXTRA_DSO_LDOPTS += $(TK_LIBS)
-
-GL_PROVIDER = Null
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-ifndef WINCE
-GL_PROVIDER = WGL
-endif
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-ifndef MOZ_PLATFORM_MAEMO
-GL_PROVIDER = GLX
-endif
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
-GL_PROVIDER = CGL
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-ifdef MOZ_PLATFORM_MAEMO
-GL_PROVIDER = EGL
-endif
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
-GL_PROVIDER = EGL
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),android)
-GL_PROVIDER = EGL
-endif
-
-# Mac is a special snowflake
-ifeq ($(GL_PROVIDER),CGL)
-CMMSRCS += GLContextProvider$(GL_PROVIDER).mm
-else
-CPPSRCS += GLContextProvider$(GL_PROVIDER).cpp
-endif
-
-DEFINES += -DIMPL_THEBES -DWOFF_MOZILLA_CLIENT
-
-include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
-
-DEFINES := $(filter-out -DUNICODE,$(DEFINES))
-
-CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)
-CFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-ifdef WINCE
-CXXFLAGS += $(CAIRO_FT_CFLAGS)
-endif
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),android)
-CXXFLAGS += $(CAIRO_FT_CFLAGS)
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-CXXFLAGS += $(MOZ_PANGO_CFLAGS)
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
-CXXFLAGS += $(CAIRO_FT_CFLAGS)
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
-CXXFLAGS += $(CAIRO_FT_CFLAGS)
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
-CXXFLAGS += $(CAIRO_FT_CFLAGS) $(MOZ_PANGO_CFLAGS)
-endif
rename from gfx/thebes/src/woff-private.h
rename to gfx/thebes/woff-private.h
rename from gfx/thebes/src/woff.c
rename to gfx/thebes/woff.c
rename from gfx/thebes/src/woff.h
rename to gfx/thebes/woff.h