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

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

Issue 1380653003: Mac Overlays: Allow SolidColor and Tile quads to be candidates for overlays. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@AllOrNothing2
Patch Set: Plumb allow_overlay Created 5 years, 2 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 #include "cc/resources/resource_provider.h" 5 #include "cc/resources/resource_provider.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 9
10 #include "base/atomic_sequence_num.h" 10 #include "base/atomic_sequence_num.h"
(...skipping 858 matching lines...) Expand 10 before | Expand all | Expand 10 after
869 resource_(resource_provider->LockForWrite(resource_id)) { 869 resource_(resource_provider->LockForWrite(resource_id)) {
870 ResourceProvider::PopulateSkBitmapWithResource(&sk_bitmap_, resource_); 870 ResourceProvider::PopulateSkBitmapWithResource(&sk_bitmap_, resource_);
871 DCHECK(valid()); 871 DCHECK(valid());
872 } 872 }
873 873
874 ResourceProvider::ScopedWriteLockSoftware::~ScopedWriteLockSoftware() { 874 ResourceProvider::ScopedWriteLockSoftware::~ScopedWriteLockSoftware() {
875 DCHECK(thread_checker_.CalledOnValidThread()); 875 DCHECK(thread_checker_.CalledOnValidThread());
876 resource_provider_->UnlockForWrite(resource_); 876 resource_provider_->UnlockForWrite(resource_);
877 } 877 }
878 878
879 ResourceProvider::ScopedReadLockGpuMemoryBuffer::ScopedReadLockGpuMemoryBuffer(
880 ResourceProvider* resource_provider,
881 ResourceId resource_id)
882 : resource_provider_(resource_provider), resource_id_(resource_id) {
883 const Resource* resource = resource_provider->GetResource(resource_id);
884 image_id_ = resource->image_id;
885 }
886
887 ResourceProvider::ScopedReadLockGpuMemoryBuffer::
888 ~ScopedReadLockGpuMemoryBuffer() {
889 }
890
879 ResourceProvider::ScopedWriteLockGpuMemoryBuffer:: 891 ResourceProvider::ScopedWriteLockGpuMemoryBuffer::
880 ScopedWriteLockGpuMemoryBuffer(ResourceProvider* resource_provider, 892 ScopedWriteLockGpuMemoryBuffer(ResourceProvider* resource_provider,
881 ResourceId resource_id) 893 ResourceId resource_id)
882 : resource_provider_(resource_provider), 894 : resource_provider_(resource_provider),
883 resource_(resource_provider->LockForWrite(resource_id)), 895 resource_(resource_provider->LockForWrite(resource_id)),
884 gpu_memory_buffer_manager_(resource_provider->gpu_memory_buffer_manager_), 896 gpu_memory_buffer_manager_(resource_provider->gpu_memory_buffer_manager_),
885 gpu_memory_buffer_(nullptr), 897 gpu_memory_buffer_(nullptr),
886 size_(resource_->size), 898 size_(resource_->size),
887 format_(resource_->format) { 899 format_(resource_->format) {
888 DCHECK_EQ(RESOURCE_TYPE_GL_TEXTURE, resource_->type); 900 DCHECK_EQ(RESOURCE_TYPE_GL_TEXTURE, resource_->type);
(...skipping 771 matching lines...) Expand 10 before | Expand all | Expand 10 after
1660 const int kImportance = 2; 1672 const int kImportance = 2;
1661 pmd->CreateSharedGlobalAllocatorDump(guid); 1673 pmd->CreateSharedGlobalAllocatorDump(guid);
1662 pmd->AddOwnershipEdge(dump->guid(), guid, kImportance); 1674 pmd->AddOwnershipEdge(dump->guid(), guid, kImportance);
1663 } 1675 }
1664 } 1676 }
1665 1677
1666 return true; 1678 return true;
1667 } 1679 }
1668 1680
1669 } // namespace cc 1681 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698