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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/resources/resource_provider.cc

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 side-by-side diff with in-line comments
Download patch
« cc/resources/resource_provider.h ('K') | « cc/resources/resource_provider.h ('k') | cc/resources/resource_provider_unittest.cc » ('j') | cc/resources/single_release_callback.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/resource_provider.cc
diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc
index f9c4b3e8d2d52740f905fed5393cfe5c18cf852f..b3bccd4945cf307772eede46f3875dc61b877ec6 100644
--- a/cc/resources/resource_provider.cc
+++ b/cc/resources/resource_provider.cc
@@ -212,7 +212,7 @@ ResourceProvider::Resource::Resource()
gl_pixel_buffer_id(0),
gl_upload_query_id(0),
gl_read_lock_query_id(0),
- pixels(NULL),
+ pixels(nullptr),
lock_for_read_count(0),
imported_count(0),
exported_count(0),
@@ -226,7 +226,7 @@ ResourceProvider::Resource::Resource()
read_lock_fences_enabled(false),
has_shared_bitmap_id(false),
allow_overlay(false),
- read_lock_fence(NULL),
+ read_lock_fence(nullptr),
size(),
origin(Internal),
target(0),
@@ -239,7 +239,7 @@ ResourceProvider::Resource::Resource()
hint(TextureHintImmutable),
type(InvalidType),
format(RGBA_8888),
- shared_bitmap(NULL) {
+ shared_bitmap(nullptr) {
}
ResourceProvider::Resource::~Resource() {}
@@ -258,7 +258,7 @@ ResourceProvider::Resource::Resource(GLuint texture_id,
gl_pixel_buffer_id(0),
gl_upload_query_id(0),
gl_read_lock_query_id(0),
- pixels(NULL),
+ pixels(nullptr),
lock_for_read_count(0),
imported_count(0),
exported_count(0),
@@ -272,7 +272,7 @@ ResourceProvider::Resource::Resource(GLuint texture_id,
read_lock_fences_enabled(false),
has_shared_bitmap_id(false),
allow_overlay(false),
- read_lock_fence(NULL),
+ read_lock_fence(nullptr),
size(size),
origin(origin),
target(target),
@@ -285,7 +285,7 @@ ResourceProvider::Resource::Resource(GLuint texture_id,
hint(hint),
type(GLTexture),
format(format),
- shared_bitmap(NULL) {
+ shared_bitmap(nullptr) {
DCHECK(wrap_mode == GL_CLAMP_TO_EDGE || wrap_mode == GL_REPEAT);
DCHECK_EQ(origin == Internal, !!texture_pool);
}
@@ -315,7 +315,7 @@ ResourceProvider::Resource::Resource(uint8_t* pixels,
read_lock_fences_enabled(false),
has_shared_bitmap_id(!!bitmap),
allow_overlay(false),
- read_lock_fence(NULL),
+ read_lock_fence(nullptr),
size(size),
origin(origin),
target(0),
@@ -345,7 +345,7 @@ ResourceProvider::Resource::Resource(const SharedBitmapId& bitmap_id,
gl_pixel_buffer_id(0),
gl_upload_query_id(0),
gl_read_lock_query_id(0),
- pixels(NULL),
+ pixels(nullptr),
lock_for_read_count(0),
imported_count(0),
exported_count(0),
@@ -359,7 +359,7 @@ ResourceProvider::Resource::Resource(const SharedBitmapId& bitmap_id,
read_lock_fences_enabled(false),
has_shared_bitmap_id(true),
allow_overlay(false),
- read_lock_fence(NULL),
+ read_lock_fence(nullptr),
size(size),
origin(origin),
target(0),
@@ -373,7 +373,7 @@ ResourceProvider::Resource::Resource(const SharedBitmapId& bitmap_id,
type(Bitmap),
format(RGBA_8888),
shared_bitmap_id(bitmap_id),
- shared_bitmap(NULL) {
+ shared_bitmap(nullptr) {
DCHECK(wrap_mode == GL_CLAMP_TO_EDGE || wrap_mode == GL_REPEAT);
}
@@ -675,9 +675,9 @@ void ResourceProvider::DeleteResourceInternal(ResourceMap::iterator it,
base::SharedMemory* shared_memory = resource->mailbox.shared_memory();
if (resource->pixels && shared_memory) {
DCHECK(shared_memory->memory() == resource->pixels);
- resource->pixels = NULL;
+ resource->pixels = nullptr;
delete resource->shared_bitmap;
- resource->shared_bitmap = NULL;
+ resource->shared_bitmap = nullptr;
}
}
resource->release_callback_impl.Run(
@@ -693,7 +693,7 @@ void ResourceProvider::DeleteResourceInternal(ResourceMap::iterator it,
DCHECK(resource->origin != Resource::External);
DCHECK_EQ(Bitmap, resource->type);
delete resource->shared_bitmap;
- resource->pixels = NULL;
+ resource->pixels = nullptr;
}
if (resource->pixels) {
DCHECK(resource->origin == Resource::Internal);
@@ -1662,7 +1662,7 @@ void ResourceProvider::AcquirePixelBuffer(ResourceId id) {
gl->BufferData(GL_PIXEL_UNPACK_TRANSFER_BUFFER_CHROMIUM,
resource->size.height() *
RoundUp(bytes_per_pixel * resource->size.width(), 4u),
- NULL,
+ nullptr,
GL_DYNAMIC_DRAW);
gl->BindBuffer(GL_PIXEL_UNPACK_TRANSFER_BUFFER_CHROMIUM, 0);
}
@@ -1696,7 +1696,7 @@ void ResourceProvider::ReleasePixelBuffer(ResourceId id) {
gl->BindBuffer(GL_PIXEL_UNPACK_TRANSFER_BUFFER_CHROMIUM,
resource->gl_pixel_buffer_id);
gl->BufferData(
- GL_PIXEL_UNPACK_TRANSFER_BUFFER_CHROMIUM, 0, NULL, GL_DYNAMIC_DRAW);
+ GL_PIXEL_UNPACK_TRANSFER_BUFFER_CHROMIUM, 0, nullptr, GL_DYNAMIC_DRAW);
gl->BindBuffer(GL_PIXEL_UNPACK_TRANSFER_BUFFER_CHROMIUM, 0);
}
@@ -1808,7 +1808,7 @@ void ResourceProvider::BeginSetPixels(ResourceId id) {
0, /* border */
GLDataFormat(resource->format),
GLDataType(resource->format),
- NULL);
+ nullptr);
} else {
gl->AsyncTexSubImage2DCHROMIUM(GL_TEXTURE_2D,
0, /* level */
@@ -1818,7 +1818,7 @@ void ResourceProvider::BeginSetPixels(ResourceId id) {
resource->size.height(),
GLDataFormat(resource->format),
GLDataType(resource->format),
- NULL);
+ nullptr);
}
gl->EndQueryEXT(GL_ASYNC_PIXEL_UNPACK_COMPLETED_CHROMIUM);
gl->BindBuffer(GL_PIXEL_UNPACK_TRANSFER_BUFFER_CHROMIUM, 0);
@@ -1963,7 +1963,7 @@ void ResourceProvider::LazyAllocate(Resource* resource) {
0,
GLDataFormat(format),
GLDataType(format),
- NULL));
+ nullptr));
}
}
}
@@ -2053,12 +2053,12 @@ GLint ResourceProvider::GetActiveTextureUnit(GLES2Interface* gl) {
GLES2Interface* ResourceProvider::ContextGL() const {
ContextProvider* context_provider = output_surface_->context_provider();
- return context_provider ? context_provider->ContextGL() : NULL;
+ return context_provider ? context_provider->ContextGL() : nullptr;
}
class GrContext* ResourceProvider::GrContext() const {
ContextProvider* context_provider = output_surface_->context_provider();
- return context_provider ? context_provider->GrContext() : NULL;
+ return context_provider ? context_provider->GrContext() : nullptr;
}
} // namespace cc
« cc/resources/resource_provider.h ('K') | « cc/resources/resource_provider.h ('k') | cc/resources/resource_provider_unittest.cc » ('j') | cc/resources/single_release_callback.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698