ma1 pushed to branch mullvad-browser-128.14.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser

Commits:

• fa6f4582
  by hackademix at 2025-09-16T00:50:48+02:00

  Revert "Bug 1986185. r=aosmond a=RyanVM"
  
  This reverts commit df081c6cbd02a1c25bf1582bff5295a17bcff49a.
  

• b96034cc
  by Lee Salzman at 2025-09-16T00:50:49+02:00

  Bug 1913773 - Ensure mCurrentShmem is valid. r=aosmond
  
  Adapted from esr140 to esr128 (tor-browser#44199)
  
  Differential Revision: https://phabricator.services.mozilla.com/D219832
  

• 51680c11
  by Lee Salzman at 2025-09-16T00:50:51+02:00

  Bug 1986185. r=aosmond a=RyanVM
  
  Backported manually to 128esr, see BB 44199
  
  Differential Revision: https://phabricator.services.mozilla.com/D263287
  

2 changed files:

• gfx/layers/ipc/CanvasTranslator.cpp
• gfx/layers/ipc/CanvasTranslator.h

Changes:

   CheckAndSignalWriter();

   // Default sized buffers will have been queued for recycling.

-  if (mCurrentShmem.Size() == mDefaultBufferSize) {

+  if (mCurrentShmem.IsValid() && mCurrentShmem.Size() == mDefaultBufferSize) {

     mCanvasShmems.emplace(std::move(mCurrentShmem));

   }

   struct CanvasShmem {

     RefPtr<ipc::SharedMemoryBasic> shmem;

-    auto Size() { return shmem->Size(); }

+    bool IsValid() const { return !!shmem; }

+    auto Size() { return shmem ? shmem->Size() : 0; }

     gfx::MemReader CreateMemReader() {

-      return {static_cast<char*>(shmem->memory()), Size()};

+      if (!shmem) {

+        return {nullptr, 0};

+      }

+      return {static_cast<char*>(shmem->Memory()), Size()};

     }

   };

   std::queue<CanvasShmem> mCanvasShmems;