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

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

Issue 638353002: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr in src/… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Formating. 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
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 507 matching lines...) Expand 10 before | Expand all | Expand 10 after
518 void DestroyChildInternal(ChildMap::iterator it, DeleteStyle style); 518 void DestroyChildInternal(ChildMap::iterator it, DeleteStyle style);
519 void LazyCreate(Resource* resource); 519 void LazyCreate(Resource* resource);
520 void LazyAllocate(Resource* resource); 520 void LazyAllocate(Resource* resource);
521 521
522 void BindImageForSampling(Resource* resource); 522 void BindImageForSampling(Resource* resource);
523 // Binds the given GL resource to a texture target for sampling using the 523 // Binds the given GL resource to a texture target for sampling using the
524 // specified filter for both minification and magnification. Returns the 524 // specified filter for both minification and magnification. Returns the
525 // texture target used. The resource must be locked for reading. 525 // texture target used. The resource must be locked for reading.
526 GLenum BindForSampling(ResourceId resource_id, GLenum unit, GLenum filter); 526 GLenum BindForSampling(ResourceId resource_id, GLenum unit, GLenum filter);
527 527
528 // Returns NULL if the output_surface_ does not have a ContextProvider. 528 // Returns nullptr if the output_surface_ does not have a ContextProvider.
danakj 2014/10/10 17:28:46 just use null
529 gpu::gles2::GLES2Interface* ContextGL() const; 529 gpu::gles2::GLES2Interface* ContextGL() const;
530 class GrContext* GrContext() const; 530 class GrContext* GrContext() const;
531 531
532 OutputSurface* output_surface_; 532 OutputSurface* output_surface_;
533 SharedBitmapManager* shared_bitmap_manager_; 533 SharedBitmapManager* shared_bitmap_manager_;
534 BlockingTaskRunner* blocking_main_thread_task_runner_; 534 BlockingTaskRunner* blocking_main_thread_task_runner_;
535 bool lost_output_surface_; 535 bool lost_output_surface_;
536 int highp_threshold_min_; 536 int highp_threshold_min_;
537 ResourceId next_id_; 537 ResourceId next_id_;
538 ResourceMap resources_; 538 ResourceMap resources_;
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
609 return format_gl_data_format[format]; 609 return format_gl_data_format[format];
610 } 610 }
611 611
612 inline GLenum GLInternalFormat(ResourceFormat format) { 612 inline GLenum GLInternalFormat(ResourceFormat format) {
613 return GLDataFormat(format); 613 return GLDataFormat(format);
614 } 614 }
615 615
616 } // namespace cc 616 } // namespace cc
617 617
618 #endif // CC_RESOURCES_RESOURCE_PROVIDER_H_ 618 #endif // CC_RESOURCES_RESOURCE_PROVIDER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698