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

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

Issue 645853008: Standardize usage of virtual/override/final in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Formatted Created 6 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
« no previous file with comments | « cc/resources/rasterizer.h ('k') | cc/resources/resource_provider.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <deque> 8 #include <deque>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 231
232 class CC_EXPORT ScopedSamplerGL : public ScopedReadLockGL { 232 class CC_EXPORT ScopedSamplerGL : public ScopedReadLockGL {
233 public: 233 public:
234 ScopedSamplerGL(ResourceProvider* resource_provider, 234 ScopedSamplerGL(ResourceProvider* resource_provider,
235 ResourceProvider::ResourceId resource_id, 235 ResourceProvider::ResourceId resource_id,
236 GLenum filter); 236 GLenum filter);
237 ScopedSamplerGL(ResourceProvider* resource_provider, 237 ScopedSamplerGL(ResourceProvider* resource_provider,
238 ResourceProvider::ResourceId resource_id, 238 ResourceProvider::ResourceId resource_id,
239 GLenum unit, 239 GLenum unit,
240 GLenum filter); 240 GLenum filter);
241 virtual ~ScopedSamplerGL(); 241 ~ScopedSamplerGL() override;
242 242
243 GLenum target() const { return target_; } 243 GLenum target() const { return target_; }
244 244
245 private: 245 private:
246 GLenum unit_; 246 GLenum unit_;
247 GLenum target_; 247 GLenum target_;
248 248
249 DISALLOW_COPY_AND_ASSIGN(ScopedSamplerGL); 249 DISALLOW_COPY_AND_ASSIGN(ScopedSamplerGL);
250 }; 250 };
251 251
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
612 return format_gl_data_format[format]; 612 return format_gl_data_format[format];
613 } 613 }
614 614
615 inline GLenum GLInternalFormat(ResourceFormat format) { 615 inline GLenum GLInternalFormat(ResourceFormat format) {
616 return GLDataFormat(format); 616 return GLDataFormat(format);
617 } 617 }
618 618
619 } // namespace cc 619 } // namespace cc
620 620
621 #endif // CC_RESOURCES_RESOURCE_PROVIDER_H_ 621 #endif // CC_RESOURCES_RESOURCE_PROVIDER_H_
OLDNEW
« no previous file with comments | « cc/resources/rasterizer.h ('k') | cc/resources/resource_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698