Backed out changeset 538a6a953f5d (bug 943686)
authorSebastian Hengst <archaeopteryx@coole-files.de>
Mon, 20 Mar 2017 22:59:41 +0100
changeset 501788 4b473fd58d07762772695d771096199da4acc00c
parent 501787 d572929cc1829e28403125aa05ec5930cf914fd3
child 501789 e427c48b6a0a24cc3cae8890c2f6c44603c3f2de
push id50127
push userna-g@nostrum.com
push dateTue, 21 Mar 2017 00:09:45 +0000
bugs943686
milestone55.0a1
backs out538a6a953f5dcd16f303597e05a6665a42d3e657
Backed out changeset 538a6a953f5d (bug 943686)
image/moz.build
--- a/image/moz.build
+++ b/image/moz.build
@@ -68,29 +68,33 @@ UNIFIED_SOURCES += [
     'imgFrame.cpp',
     'imgLoader.cpp',
     'imgRequest.cpp',
     'imgRequestProxy.cpp',
     'imgTools.cpp',
     'MultipartImage.cpp',
     'OrientedImage.cpp',
     'ProgressTracker.cpp',
-    'RasterImage.cpp',
     'ScriptedNotificationObserver.cpp',
     'ShutdownTracker.cpp',
     'SourceBuffer.cpp',
     'SurfaceCache.cpp',
     'SurfaceCacheUtils.cpp',
     'SurfacePipe.cpp',
     'SVGDocumentWrapper.cpp',
     'VectorImage.cpp',
 ]
 if CONFIG['MOZ_ENABLE_SKIA']:
     UNIFIED_SOURCES += [ 'Downscaler.cpp']
 
+# These files can't be unified because of ImageLogging.h #include order issues.
+SOURCES += [
+    'RasterImage.cpp',
+]
+
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     # Because SVGDocumentWrapper.cpp includes "mozilla/dom/SVGSVGElement.h"
     '/dom/base',
     '/dom/svg',