Bug 943686 - Add imageLoader.cpp to unified sources. r=tn
☠☠ backed out by 083daa40d2d7 ☠ ☠
authorEric Rahm <erahm@mozilla.com>
Mon, 20 Mar 2017 14:28:40 -0700
changeset 348462 8c34803d1392c125b736614b652f1935ea6f5019
parent 348461 ec098c9386d31343e1188cd51240e92dbb3e73c7
child 348463 726f50ce3a40fc35279cf9d240128d54e4053fd2
push id88237
push usererahm@mozilla.com
push dateMon, 20 Mar 2017 21:30:17 +0000
treeherdermozilla-inbound@538a6a953f5d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstn
bugs943686
milestone55.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 943686 - Add imageLoader.cpp to unified sources. r=tn MozReview-Commit-ID: G9sFOtbFYjP
image/imgLoader.cpp
image/moz.build
--- a/image/imgLoader.cpp
+++ b/image/imgLoader.cpp
@@ -123,17 +123,17 @@ public:
            !iter.Done();
            iter.Next()) {
         imgCacheEntry* entry = iter.UserData();
         if (entry->HasNoProxies()) {
           continue;
         }
 
         RefPtr<imgRequest> req = entry->GetRequest();
-        RefPtr<Image> image = req->GetImage();
+        RefPtr<image::Image> image = req->GetImage();
         if (!image) {
           continue;
         }
 
         // Both this and EntryImageSizes measure images/content/raster/used/decoded
         // memory.  This function's measurement is secondary -- the result doesn't
         // go in the "explicit" tree -- so we use moz_malloc_size_of instead of
         // ImagesMallocSizeOf to prevent DMD from seeing it reported twice.
@@ -396,17 +396,17 @@ private:
     aHandleReport->Callback(EmptyCString(), path, aKind, UNITS_BYTES,
                             aValue, desc, aData);
   }
 
   static void RecordCounterForRequest(imgRequest* aRequest,
                                       nsTArray<ImageMemoryCounter>* aArray,
                                       bool aIsUsed)
   {
-    RefPtr<Image> image = aRequest->GetImage();
+    RefPtr<image::Image> image = aRequest->GetImage();
     if (!image) {
       return;
     }
 
     ImageMemoryCounter counter(image, ImagesMallocSizeOf, aIsUsed);
 
     aArray->AppendElement(Move(counter));
   }
--- a/image/moz.build
+++ b/image/moz.build
@@ -61,16 +61,17 @@ UNIFIED_SOURCES += [
     'FrozenImage.cpp',
     'IDecodingTask.cpp',
     'Image.cpp',
     'ImageCacheKey.cpp',
     'ImageFactory.cpp',
     'ImageOps.cpp',
     'ImageWrapper.cpp',
     'imgFrame.cpp',
+    'imgLoader.cpp',
     'imgTools.cpp',
     'MultipartImage.cpp',
     'OrientedImage.cpp',
     'ScriptedNotificationObserver.cpp',
     'ShutdownTracker.cpp',
     'SourceBuffer.cpp',
     'SurfaceCache.cpp',
     'SurfaceCacheUtils.cpp',
@@ -78,17 +79,16 @@ UNIFIED_SOURCES += [
     '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 += [
-    'imgLoader.cpp',
     'imgRequest.cpp',
     'imgRequestProxy.cpp',
     'ProgressTracker.cpp',
     'RasterImage.cpp',
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')