Bug 1492930 - Part 2. Expose the external image ID for surfaces' memo…

…ry reporting. r=nical
dothq · Sep 25, 2018 · c1c4901 · c1c4901
1 parent 300f791
commit c1c4901
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 8 deletions.
diff --git a/gfx/2d/2D.h b/gfx/2d/2D.h
@@ -420,7 +420,7 @@ class SourceSurface : public external::AtomicRefCounted<SourceSurface>
   void AddUserData(UserDataKey *key, void *userData, void (*destroy)(void*)) {
     mUserData.Add(key, userData, destroy);
   }
-  void *GetUserData(UserDataKey *key) {
+  void *GetUserData(UserDataKey *key) const {
     return mUserData.Get(key);
   }
   void RemoveUserData(UserDataKey *key) {
@@ -587,7 +587,8 @@ class DataSourceSurface : public SourceSurface
   virtual void AddSizeOfExcludingThis(MallocSizeOf aMallocSizeOf,
                                       size_t& aHeapSizeOut,
                                       size_t& aNonHeapSizeOut,
-                                      size_t& aExtHandlesOut) const
+                                      size_t& aExtHandlesOut,
+                                      uint64_t& aExtIdOut) const
   {
   }
 

diff --git a/gfx/2d/SourceSurfaceRawData.cpp b/gfx/2d/SourceSurfaceRawData.cpp
@@ -83,7 +83,8 @@ void
 SourceSurfaceAlignedRawData::AddSizeOfExcludingThis(MallocSizeOf aMallocSizeOf,
                                                     size_t& aHeapSizeOut,
                                                     size_t& aNonHeapSizeOut,
-                                                    size_t& aExtHandlesOut) const
+                                                    size_t& aExtHandlesOut,
+                                                    uint64_t& aExtIdOut) const
 {
   aHeapSizeOut += mArray.HeapSizeOfExcludingThis(aMallocSizeOf);
 }

diff --git a/gfx/2d/SourceSurfaceRawData.h b/gfx/2d/SourceSurfaceRawData.h
@@ -131,7 +131,8 @@ class SourceSurfaceAlignedRawData : public DataSourceSurface
   void AddSizeOfExcludingThis(MallocSizeOf aMallocSizeOf,
                               size_t& aHeapSizeOut,
                               size_t& aNonHeapSizeOut,
-                              size_t& aExtHandlesOut) const override;
+                              size_t& aExtHandlesOut,
+                              uint64_t& aExtIdOut) const override;
 
   virtual bool Map(MapType, MappedSurface *aMappedSurface) override
   {

diff --git a/gfx/layers/SourceSurfaceSharedData.cpp b/gfx/layers/SourceSurfaceSharedData.cpp
@@ -97,7 +97,8 @@ void
 SourceSurfaceSharedData::AddSizeOfExcludingThis(MallocSizeOf aMallocSizeOf,
                                                 size_t& aHeapSizeOut,
                                                 size_t& aNonHeapSizeOut,
-                                                size_t& aExtHandlesOut) const
+                                                size_t& aExtHandlesOut,
+                                                uint64_t& aExtIdOut) const
 {
   MutexAutoLock lock(mMutex);
   if (mBuf) {
@@ -106,6 +107,10 @@ SourceSurfaceSharedData::AddSizeOfExcludingThis(MallocSizeOf aMallocSizeOf,
   if (!mClosed) {
     ++aExtHandlesOut;
   }
+  Maybe<wr::ExternalImageId> extId = SharedSurfacesChild::GetExternalId(this);
+  if (extId) {
+    aExtIdOut = wr::AsUint64(extId.ref());
+  }
 }
 
 uint8_t*

diff --git a/gfx/layers/SourceSurfaceSharedData.h b/gfx/layers/SourceSurfaceSharedData.h
@@ -175,7 +175,8 @@ class SourceSurfaceSharedData final : public DataSourceSurface
   void AddSizeOfExcludingThis(MallocSizeOf aMallocSizeOf,
                               size_t& aHeapSizeOut,
                               size_t& aNonHeapSizeOut,
-                              size_t& aExtHandlesOut) const override;
+                              size_t& aExtHandlesOut,
+                              uint64_t& aExtIdOut) const override;
 
   bool OnHeap() const override
   {

diff --git a/gfx/layers/SourceSurfaceVolatileData.cpp b/gfx/layers/SourceSurfaceVolatileData.cpp
@@ -42,7 +42,8 @@ void
 SourceSurfaceVolatileData::AddSizeOfExcludingThis(MallocSizeOf aMallocSizeOf,
                                                   size_t& aHeapSizeOut,
                                                   size_t& aNonHeapSizeOut,
-                                                  size_t& aExtHandlesOut) const
+                                                  size_t& aExtHandlesOut,
+                                                  uint64_t& aExtIdOut) const
 {
   if (mVBuf) {
     aHeapSizeOut += mVBuf->HeapSizeOfExcludingThis(aMallocSizeOf);

diff --git a/gfx/layers/SourceSurfaceVolatileData.h b/gfx/layers/SourceSurfaceVolatileData.h
@@ -53,7 +53,8 @@ class SourceSurfaceVolatileData : public DataSourceSurface
   void AddSizeOfExcludingThis(MallocSizeOf aMallocSizeOf,
                               size_t& aHeapSizeOut,
                               size_t& aNonHeapSizeOut,
-                              size_t& aExtHandlesOut) const override;
+                              size_t& aExtHandlesOut,
+                              uint64_t& aExtIdOut) const override;
 
   bool OnHeap() const override
   {