| Index: content/browser/gpu/gpu_data_manager_impl.cc
|
| diff --git a/content/browser/gpu/gpu_data_manager_impl.cc b/content/browser/gpu/gpu_data_manager_impl.cc
|
| index fb2fb3847e153ff44d616508516e7ac9948bb519..443b600fdb34664f11b44284148b32b4ab353571 100644
|
| --- a/content/browser/gpu/gpu_data_manager_impl.cc
|
| +++ b/content/browser/gpu/gpu_data_manager_impl.cc
|
| @@ -63,10 +63,6 @@ void GpuDataManagerImpl::InitializeForTesting(
|
| const gpu::GpuControlListData& gpu_blacklist_data,
|
| const gpu::GPUInfo& gpu_info) {
|
| base::AutoLock auto_lock(lock_);
|
| - // Relax the cross-thread access restriction to non-thread-safe RefCount.
|
| - // See the comment in Initialize().
|
| - base::ScopedAllowCrossThreadRefCountAccess
|
| - allow_cross_thread_ref_count_access;
|
| private_->InitializeForTesting(gpu_blacklist_data, gpu_info);
|
| }
|
|
|
| @@ -191,20 +187,11 @@ void GpuDataManagerImpl::SetGpuInfo(const gpu::GPUInfo& gpu_info) {
|
|
|
| void GpuDataManagerImpl::Initialize() {
|
| base::AutoLock auto_lock(lock_);
|
| - // Relax the cross-thread access restriction to non-thread-safe RefCount.
|
| - // GpuDataManagerImplPrivate has GpuControlLists, which touches
|
| - // non-thread-safe GpuControlListEntry RefCount in the lock.
|
| - base::ScopedAllowCrossThreadRefCountAccess
|
| - allow_cross_thread_ref_count_access;
|
| private_->Initialize();
|
| }
|
|
|
| void GpuDataManagerImpl::UpdateGpuInfo(const gpu::GPUInfo& gpu_info) {
|
| base::AutoLock auto_lock(lock_);
|
| - // Relax the cross-thread access restriction to non-thread-safe RefCount.
|
| - // See the comment in Initialize().
|
| - base::ScopedAllowCrossThreadRefCountAccess
|
| - allow_cross_thread_ref_count_access;
|
| private_->UpdateGpuInfo(gpu_info);
|
| }
|
|
|
| @@ -310,10 +297,6 @@ size_t GpuDataManagerImpl::GetBlacklistedFeatureCount() const {
|
| bool GpuDataManagerImpl::UpdateActiveGpu(uint32_t vendor_id,
|
| uint32_t device_id) {
|
| base::AutoLock auto_lock(lock_);
|
| - // Relax the cross-thread access restriction to non-thread-safe RefCount.
|
| - // See the comment in Initialize().
|
| - base::ScopedAllowCrossThreadRefCountAccess
|
| - allow_cross_thread_ref_count_access;
|
| return private_->UpdateActiveGpu(vendor_id, device_id);
|
| }
|
|
|
|
|