Bug 510894 - only build nsICanvasGLPrivate if MOZ_ENABLE_CANVAS3D is set, put it in content_canvas.xpt instead of content.xpt, and remove the accidental content.xpt, r=ted,vlad

browser/installer/removed-files.in

@@ -595,6 +595,7 @@ modules/JSON.jsm
 LICENSE
 extensions/inspector@mozilla.org/chrome/chromelist.txt
 components/accessibility.xpt
+components/content.xpt
 components/crashreporter.xpt
 components/gksvgrenderer.xpt
 components/jsconsole.xpt

content/canvas/public/Makefile.in

@@ -49,8 +49,14 @@ EXPORTS		= \
 		nsICanvasElement.h \
 		$(NULL)
 
+ifdef MOZ_ENABLE_CANVAS3D
+
+XPIDL_MODULE = content_canvas
+
 XPIDLSRCS	= \
 		nsICanvasGLPrivate.idl \
 		$(NULL)
 
+endif
+
 include $(topsrcdir)/config/rules.mk