| Index: cc/resources/resource_provider.h
|
| diff --git a/cc/resources/resource_provider.h b/cc/resources/resource_provider.h
|
| index 2f28ef47596b9d4a838213c8a475a351f5e99530..e44b75e87649912d184477cce6b70879d9adc03a 100644
|
| --- a/cc/resources/resource_provider.h
|
| +++ b/cc/resources/resource_provider.h
|
| @@ -301,6 +301,8 @@ class CC_EXPORT ResourceProvider {
|
| class Fence : public base::RefCounted<Fence> {
|
| public:
|
| Fence() {}
|
| +
|
| + virtual void Set() = 0;
|
| virtual bool HasPassed() = 0;
|
|
|
| protected:
|
| @@ -356,7 +358,7 @@ class CC_EXPORT ResourceProvider {
|
| void SetReadLockFence(Fence* fence) { current_read_lock_fence_ = fence; }
|
|
|
| // Enable read lock fences for a specific resource.
|
| - void EnableReadLockFences(ResourceProvider::ResourceId id, bool enable);
|
| + void EnableReadLockFences(ResourceProvider::ResourceId id);
|
|
|
| // Indicates if we can currently lock this resource for write.
|
| bool CanLockForWrite(ResourceId id);
|
| @@ -418,7 +420,7 @@ class CC_EXPORT ResourceProvider {
|
| bool pending_set_pixels : 1;
|
| bool set_pixels_completion_forced : 1;
|
| bool allocated : 1;
|
| - bool enable_read_lock_fences : 1;
|
| + bool read_lock_fences_enabled : 1;
|
| bool has_shared_bitmap_id : 1;
|
| bool allow_overlay : 1;
|
| scoped_refptr<Fence> read_lock_fence;
|
|
|