Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WTF::Mutex removed from Blink

Browse Source 
Chromium change:
https://chromium.googlesource.com/chromium/src/+/547e262451926da590a9a55ecd926a2b5d9d3ebb

commit 547e262451926da590a9a55ecd926a2b5d9d3ebb
Author: Benoit Lize <lizeb@chromium.org>
Date:   Fri Jul 1 12:22:37 2022 +0000

    [blink/wtf] Complete the WTF::Mutex -> base::Lock transition

    WTF::Mutex is no more, remove it.

    As part of the last conversions, rename mutex -> lock, and convert some
    comments to locking annotations.

    Bug: 1290281
This commit is contained in:
Claudio DeSouza
2022-08-23 00:18:38 -04:00
committed by mkarolin
parent db564ef8b2
commit f6b4d7ead2
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
third_party/blink/renderer/core/resource_pool_limiter/resource_pool_limiter.cc
Vendored
+2 -2
View File
@@ -85,7 +85,7 @@ ResourcePoolLimiter::IssueResourceInUseTracker(
String resource_id = GetResourceIdInUse(
GetTopFrameOrContextSecurityOrigin(context), resource_type);
MutexLocker locker(resources_in_use_lock_);
base::AutoLock locker(resources_in_use_lock_);
// `insert` doesn't change the value if it already exists.
int& resource_in_use_count =
resources_in_use_.insert(resource_id, 0).stored_value->value;
@@ -99,7 +99,7 @@ ResourcePoolLimiter::IssueResourceInUseTracker(
void ResourcePoolLimiter::DropResourceInUse(
const ResourceInUseTracker* resource_in_use_tracker) {
MutexLocker locker(resources_in_use_lock_);
base::AutoLock locker(resources_in_use_lock_);
auto resource_in_use_it =
resources_in_use_.find(resource_in_use_tracker->resource_id());
DCHECK(resource_in_use_it != resources_in_use_.end());
third_party/blink/renderer/core/resource_pool_limiter/resource_pool_limiter.h
Vendored
+3 -3
View File
@@ -9,11 +9,11 @@
#include <memory>
#include <utility>
#include "base/synchronization/lock.h"
#include "third_party/blink/renderer/core/core_export.h"
#include "third_party/blink/renderer/platform/wtf/hash_map.h"
#include "third_party/blink/renderer/platform/wtf/text/string_hash.h"
#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
#include "third_party/blink/renderer/platform/wtf/threading_primitives.h"
namespace blink {
@@ -51,8 +51,8 @@ class CORE_EXPORT ResourcePoolLimiter {
void DropResourceInUse(const ResourceInUseTracker* resource_in_use_tracker);
Mutex resources_in_use_lock_;
HashMap<String, int> resources_in_use_;
base::Lock resources_in_use_lock_;
HashMap<String, int> resources_in_use_ GUARDED_BY(resources_in_use_lock_);
};
} // namespace blink