Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(586)

Side by Side Diff: cc/resources/resource_provider.h

Issue 1984873002: Add logic to ResourceProvider to correctly lock GpuMemoryBuffer Resources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CC_RESOURCES_RESOURCE_PROVIDER_H_ 5 #ifndef CC_RESOURCES_RESOURCE_PROVIDER_H_
6 #define CC_RESOURCES_RESOURCE_PROVIDER_H_ 6 #define CC_RESOURCES_RESOURCE_PROVIDER_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 308
309 private: 309 private:
310 ResourceProvider* resource_provider_; 310 ResourceProvider* resource_provider_;
311 ResourceProvider::Resource* resource_; 311 ResourceProvider::Resource* resource_;
312 SkBitmap sk_bitmap_; 312 SkBitmap sk_bitmap_;
313 base::ThreadChecker thread_checker_; 313 base::ThreadChecker thread_checker_;
314 314
315 DISALLOW_COPY_AND_ASSIGN(ScopedWriteLockSoftware); 315 DISALLOW_COPY_AND_ASSIGN(ScopedWriteLockSoftware);
316 }; 316 };
317 317
318 class CC_EXPORT ScopedReadLockGpuMemoryBuffer {
319 public:
320 ScopedReadLockGpuMemoryBuffer(ResourceProvider* resource_provider,
321 ResourceId resource_id);
322 virtual ~ScopedReadLockGpuMemoryBuffer();
323
324 unsigned texture_id() const { return resource_->gl_id; }
325 bool IsInUseByMacOSWindowServer() const;
ccameron 2016/05/17 03:36:38 This should have a GetGpuMemoryBuffer accessor, li
erikchen 2016/05/17 22:13:21 N/A
326
327 private:
328 ResourceProvider* resource_provider_;
329 ResourceId resource_id_;
330 const ResourceProvider::Resource* resource_;
331
332 DISALLOW_COPY_AND_ASSIGN(ScopedReadLockGpuMemoryBuffer);
333 };
334
318 class CC_EXPORT ScopedWriteLockGpuMemoryBuffer { 335 class CC_EXPORT ScopedWriteLockGpuMemoryBuffer {
319 public: 336 public:
320 ScopedWriteLockGpuMemoryBuffer(ResourceProvider* resource_provider, 337 ScopedWriteLockGpuMemoryBuffer(ResourceProvider* resource_provider,
321 ResourceId resource_id); 338 ResourceId resource_id);
322 ~ScopedWriteLockGpuMemoryBuffer(); 339 ~ScopedWriteLockGpuMemoryBuffer();
323 340
324 gfx::GpuMemoryBuffer* GetGpuMemoryBuffer(); 341 gfx::GpuMemoryBuffer* GetGpuMemoryBuffer();
325 342
326 private: 343 private:
327 ResourceProvider* resource_provider_; 344 ResourceProvider* resource_provider_;
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
681 // A process-unique ID used for disambiguating memory dumps from different 698 // A process-unique ID used for disambiguating memory dumps from different
682 // resource providers. 699 // resource providers.
683 int tracing_id_; 700 int tracing_id_;
684 701
685 DISALLOW_COPY_AND_ASSIGN(ResourceProvider); 702 DISALLOW_COPY_AND_ASSIGN(ResourceProvider);
686 }; 703 };
687 704
688 } // namespace cc 705 } // namespace cc
689 706
690 #endif // CC_RESOURCES_RESOURCE_PROVIDER_H_ 707 #endif // CC_RESOURCES_RESOURCE_PROVIDER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698