vcl: Improve graphic manager swapping allocation

This improves the counting of the used space by graphics and
makes the manager loop faster.

Change-Id: Ifebe5fe52722d0f22dae0d1bdef02f65afb036ae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109595
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>

1 files changed, 11 insertions, 7 deletions

diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 1e56e57a8226..30db3e932bb9 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -1276,6 +1276,8 @@ bool ImpGraphic::swapOut()
 
     bool bResult = false;
 
+    sal_Int64 nByteSize = getSizeBytes();
+
     // We have GfxLink so we have the source available
     if (mpGfxLink && mpGfxLink->IsNative())
     {
@@ -1289,9 +1291,6 @@ bool ImpGraphic::swapOut()
         // mark as swapped out
         mbSwapOut = true;
 
-        // Signal to manager that we have swapped out
-        vcl::graphic::Manager::get().swappedOut(this);
-
         bResult = true;
     }
     else
@@ -1331,12 +1330,15 @@ bool ImpGraphic::swapOut()
 
             mpSwapFile = std::move(pSwapFile);
             mbSwapOut = true;
-
-            // Signal to manager that we have swapped out
-            vcl::graphic::Manager::get().swappedOut(this);
         }
     }
 
+    if (bResult)
+    {
+        // Signal to manager that we have swapped out
+        vcl::graphic::Manager::get().swappedOut(this, nByteSize);
+    }
+
     return bResult;
 }
 
@@ -1480,7 +1482,9 @@ bool ImpGraphic::swapIn()
     }
 
     if (bReturn)
-        vcl::graphic::Manager::get().swappedIn(this);
+    {
+        vcl::graphic::Manager::get().swappedIn(this, getSizeBytes());
+    }
 
     return bReturn;
 }