Bug 1514803 - Export nsICOEncoder r=aosmond
authorBarret Rennie <barret@brennie.ca>
Tue, 08 Jan 2019 21:30:46 +0000
changeset 510173 ebeed768822e5d860e9f051c12f1800197e3697c
parent 510172 53a37a8d97ee37fbf7f9e8e6991d3964f20d38f7
child 510174 cf9a58cbb9040639fb3f83e2f7b70e6f4b4518e8
push id10547
push userffxbld-merge
push dateMon, 21 Jan 2019 13:03:58 +0000
treeherdermozilla-beta@24ec1916bffe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaosmond
bugs1514803
milestone66.0a1
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 1514803 - Export nsICOEncoder r=aosmond Depends on D14815 Differential Revision: https://phabricator.services.mozilla.com/D14816
image/encoders/ico/nsICOEncoder.cpp
image/encoders/ico/nsICOEncoder.h
image/moz.build
--- a/image/encoders/ico/nsICOEncoder.cpp
+++ b/image/encoders/ico/nsICOEncoder.cpp
@@ -1,15 +1,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsCRT.h"
 #include "mozilla/EndianUtils.h"
 #include "nsBMPEncoder.h"
+#include "BMPHeaders.h"
 #include "nsPNGEncoder.h"
 #include "nsICOEncoder.h"
 #include "nsString.h"
 #include "nsStreamUtils.h"
 #include "nsTArray.h"
 
 using namespace mozilla;
 using namespace mozilla::image;
--- a/image/encoders/ico/nsICOEncoder.h
+++ b/image/encoders/ico/nsICOEncoder.h
@@ -2,21 +2,21 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef mozilla_image_encoders_ico_nsICOEncoder_h
 #define mozilla_image_encoders_ico_nsICOEncoder_h
 
 #include "mozilla/Attributes.h"
 #include "mozilla/ReentrantMonitor.h"
+#include "mozilla/image/ICOFileHeaders.h"
 
 #include "imgIEncoder.h"
 
 #include "nsCOMPtr.h"
-#include "ICOFileHeaders.h"
 
 #define NS_ICOENCODER_CID                            \
   { /*92AE3AB2-8968-41B1-8709-B6123BCEAF21 */        \
     0x92ae3ab2, 0x8968, 0x41b1, {                    \
       0x87, 0x09, 0xb6, 0x12, 0x3b, 0Xce, 0xaf, 0x21 \
     }                                                \
   }
 
--- a/image/moz.build
+++ b/image/moz.build
@@ -50,18 +50,20 @@ EXPORTS += [
     'imgRequestProxy.h',
     'IProgressObserver.h',
     'Orientation.h',
     'SurfaceCacheUtils.h',
 ]
 
 EXPORTS.mozilla.image += [
     'encoders/bmp/nsBMPEncoder.h',
+    'encoders/ico/nsICOEncoder.h',
     'encoders/jpeg/nsJPEGEncoder.h',
     'encoders/png/nsPNGEncoder.h',
+    'ICOFileHeaders.h',
     'ImageMemoryReporter.h',
     'RecyclingSourceSurface.h',
 ]
 
 UNIFIED_SOURCES += [
     'AnimationFrameBuffer.cpp',
     'AnimationSurfaceProvider.cpp',
     'ClippedImage.cpp',