[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/mullvad-browser][mullvad-browser-128.14.0esr-14.5-1] 3 commits: Revert "Bug 1986185. r=aosmond a=RyanVM"

Title: GitLab

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:

Changes:

  • gfx/layers/ipc/CanvasTranslator.cpp
    ... ... @@ -270,7 +270,7 @@ void CanvasTranslator::AddBuffer(ipc::SharedMemoryBasic::Handle&& aBufferHandle,
    270 270 
       CheckAndSignalWriter();
    271 271
    272 272 
       // Default sized buffers will have been queued for recycling.
    273 
    -  if (mCurrentShmem.Size() == mDefaultBufferSize) {
    273 
    +  if (mCurrentShmem.IsValid() && mCurrentShmem.Size() == mDefaultBufferSize) {
    274 274 
         mCanvasShmems.emplace(std::move(mCurrentShmem));
    275 275 
       }
    276 276

  • gfx/layers/ipc/CanvasTranslator.h
    ... ... @@ -358,9 +358,13 @@ class CanvasTranslator final : public gfx::InlineTranslator,
    358 358
    359 359 
       struct CanvasShmem {
    360 360 
         RefPtr<ipc::SharedMemoryBasic> shmem;
    361 
    -    auto Size() { return shmem->Size(); }
    361 
    +    bool IsValid() const { return !!shmem; }
    362 
    +    auto Size() { return shmem ? shmem->Size() : 0; }
    362 363 
         gfx::MemReader CreateMemReader() {
    363 
    -      return {static_cast<char*>(shmem->memory()), Size()};
    364 
    +      if (!shmem) {
    365 
    +        return {nullptr, 0};
    366 
    +      }
    367 
    +      return {static_cast<char*>(shmem->Memory()), Size()};
    364 368 
         }
    365 369 
       };
    366 370 
       std::queue<CanvasShmem> mCanvasShmems;

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help Notification message regarding https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/658910d2b60cdfcc25dd72c7f87a7b5c9b62d53d...51680c11ed50d576011ec87671cd28f8479d2d81 at 1757976671 

    _______________________________________________
tor-commits mailing list -- tor-commits@xxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to tor-commits-leave@xxxxxxxxxxxxxxxxxxxx