Bug 571989 part 5: move gfx/src/thebes/utils/* to gfx/thebes. r=joedrew

--HG--
rename : gfx/src/thebes/utils/gfxBlur.cpp => gfx/thebes/gfxBlur.cpp
rename : gfx/src/thebes/utils/gfxBlur.h => gfx/thebes/gfxBlur.h
rename : gfx/src/thebes/utils/gfxThebesUtils.cpp => gfx/thebes/gfxThebesUtils.cpp
rename : gfx/src/thebes/utils/gfxThebesUtils.h => gfx/thebes/gfxThebesUtils.h
rename : gfx/src/thebes/utils/nsCoreAnimationSupport.h => gfx/thebes/nsCoreAnimationSupport.h
rename : gfx/src/thebes/utils/nsCoreAnimationSupport.mm => gfx/thebes/nsCoreAnimationSupport.mm

gfx/src/thebes/Makefile.in

@@ -52,8 +52,6 @@ GRE_MODULE = 1
 LIBXUL_LIBRARY = 1
 
 
-DIRS		= utils
-
 CPPSRCS		= \
 		nsThebesDeviceContext.cpp \
 		nsThebesRegion.cpp \

gfx/src/thebes/utils/Makefile.in

@@ -1,82 +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) 2010
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Michael Ventnor <m.ventnor@gmail.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
-
-# This library can link against both old-gfx and thebes,
-# and is not a component
-MODULE = gfx
-LIBRARY_NAME = gfxutils
-EXPORT_LIBRARY = 1
-LIBXUL_LIBRARY = 1
-
-
-CPPSRCS		= \
-		gfxThebesUtils.cpp \
-		gfxBlur.cpp \
-		$(NULL)
-
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-CMMSRCS   += \
-    nsCoreAnimationSupport.mm \
-    $(NULL)
-
-OS_LIBS += -framework OpenGL -framework QuartzCore
-endif
-
-EXTRA_DSO_LIBS	= gkgfx thebes
-
-EXPORTS         += \
-		gfxThebesUtils.h \
-		gfxBlur.h \
-		nsCoreAnimationSupport.h \
-		$(NULL)
-
-EXTRA_DSO_LDOPTS += \
-		$(LIBS_DIR) \
-		$(EXTRA_DSO_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
-DEFINES += -DIMPL_THEBES
-
-include $(topsrcdir)/config/rules.mk

gfx/thebes/Makefile.in

@@ -15,6 +15,7 @@ EXPORTS	= \
 	gfx3DMatrix.h \
 	gfxASurface.h \
 	gfxAlphaRecovery.h \
+	gfxBlur.h \
 	gfxColor.h \
 	gfxContext.h \
 	gfxFont.h \
@@ -32,11 +33,13 @@ EXPORTS	= \
 	gfxTypes.h \
 	gfxTextRunCache.h \
 	gfxTextRunWordCache.h \
+	gfxThebesUtils.h \
 	gfxUtils.h \
 	gfxUserFontSet.h \
 	GLDefs.h \
 	GLContext.h \
 	GLContextProvider.h \
+	nsCoreAnimationSupport.h \
 	$(NULL)
 
 ifdef MOZ_IPC
@@ -158,6 +161,7 @@ endif
 CPPSRCS	= \
 	gfxASurface.cpp \
 	gfxAlphaRecovery.cpp \
+	gfxBlur.cpp \
 	gfxContext.cpp \
 	gfxImageSurface.cpp \
 	gfxFont.cpp \
@@ -174,6 +178,7 @@ CPPSRCS	= \
 	gfxSkipChars.cpp \
 	gfxTextRunCache.cpp \
 	gfxTextRunWordCache.cpp \
+	gfxThebesUtils.cpp \
 	gfxUserFontSet.cpp \
 	gfxUtils.cpp \
 	gfxUnicodeProperties.cpp \
@@ -352,10 +357,13 @@ CPPSRCS	+= \
 CPPSRCS +=      nsUnicodeRange.cpp
 CPPSRCS +=      gfxQuartzNativeDrawing.cpp
 
-CMMSRCS = gfxMacPlatformFontList.mm
+CMMSRCS = \
+	gfxMacPlatformFontList.mm \
+	nsCoreAnimationSupport.mm \
+	$(NULL)
 
 # Always link with OpenGL/AGL
-EXTRA_DSO_LDOPTS += -framework OpenGL -framework AGL -framework QuickTime -framework AppKit
+EXTRA_DSO_LDOPTS += -framework OpenGL -framework AGL -framework QuickTime -framework AppKit -framework QuartzCore
 endif
 
 CSRCS += woff.c

layout/build/Makefile.in

@@ -59,7 +59,7 @@ GRE_MODULE	= 1
 LIBXUL_LIBRARY	= 1
 
 ifndef MOZ_ENABLE_LIBXUL
-EXTRA_DSO_LIBS	= gkgfx gfxutils
+EXTRA_DSO_LIBS	= gkgfx
 endif
 EXTRA_DSO_LIBS	+= thebes ycbcr
 

toolkit/library/libxul-config.mk

@@ -120,7 +120,6 @@ STATIC_LIBS += \
 	xpcom_core \
 	ucvutil_s \
 	gkgfx \
-	gfxutils \
 	$(NULL)
 
 ifdef MOZ_IPC