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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/resources/resource_provider_unittest.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.cc ('k') | cc/resources/resource_update.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_unittest.cc
diff --git a/cc/resources/resource_provider_unittest.cc b/cc/resources/resource_provider_unittest.cc
index 6dac574002e1fd762ca60b1f616bab3cb0ee1b14..288ccbe050aa2305527f498bf1d9d96810e02434 100644
--- a/cc/resources/resource_provider_unittest.cc
+++ b/cc/resources/resource_provider_unittest.cc
@@ -379,9 +379,9 @@ class ResourceProviderTest
public:
ResourceProviderTest()
: shared_data_(ContextSharedData::Create()),
- context3d_(NULL),
- child_context_(NULL),
- main_thread_task_runner_(BlockingTaskRunner::Create(NULL)) {
+ context3d_(nullptr),
+ child_context_(nullptr),
+ main_thread_task_runner_(BlockingTaskRunner::Create(nullptr)) {
switch (GetParam()) {
case ResourceProvider::GLTexture: {
scoped_ptr<ResourceProviderContext> context3d(
@@ -1160,7 +1160,7 @@ TEST_P(ResourceProviderTest, TransferGLToSoftware) {
scoped_ptr<ResourceProvider> child_resource_provider(
ResourceProvider::Create(child_output_surface.get(),
shared_bitmap_manager_.get(),
- NULL,
+ nullptr,
0,
false,
1,
@@ -1642,7 +1642,7 @@ class ResourceProviderTestTextureFilters : public ResourceProviderTest {
scoped_ptr<ResourceProvider> child_resource_provider(
ResourceProvider::Create(child_output_surface.get(),
shared_bitmap_manager.get(),
- NULL,
+ nullptr,
0,
false,
1,
@@ -1660,7 +1660,7 @@ class ResourceProviderTestTextureFilters : public ResourceProviderTest {
scoped_ptr<ResourceProvider> parent_resource_provider(
ResourceProvider::Create(parent_output_surface.get(),
shared_bitmap_manager.get(),
- NULL,
+ nullptr,
0,
false,
1,
@@ -1831,7 +1831,7 @@ TEST_P(ResourceProviderTest, TransferMailboxResources) {
uint32 release_sync_point = 0;
bool lost_resource = false;
- BlockingTaskRunner* main_thread_task_runner = NULL;
+ BlockingTaskRunner* main_thread_task_runner = nullptr;
ReleaseCallbackImpl callback = base::Bind(ReleaseCallback,
&release_sync_point,
&lost_resource,
@@ -2254,7 +2254,7 @@ TEST_P(ResourceProviderTest, LostContext) {
uint32 release_sync_point = 0;
bool lost_resource = false;
- BlockingTaskRunner* main_thread_task_runner = NULL;
+ BlockingTaskRunner* main_thread_task_runner = nullptr;
scoped_ptr<SingleReleaseCallbackImpl> callback =
SingleReleaseCallbackImpl::Create(base::Bind(ReleaseCallback,
&release_sync_point,
@@ -2265,7 +2265,7 @@ TEST_P(ResourceProviderTest, LostContext) {
EXPECT_EQ(0u, release_sync_point);
EXPECT_FALSE(lost_resource);
- EXPECT_EQ(NULL, main_thread_task_runner);
+ EXPECT_EQ(nullptr, main_thread_task_runner);
resource_provider_->DidLoseOutputSurface();
resource_provider_ = nullptr;
@@ -2292,7 +2292,7 @@ TEST_P(ResourceProviderTest, ScopedSampler) {
scoped_ptr<ResourceProvider> resource_provider(
ResourceProvider::Create(output_surface.get(),
shared_bitmap_manager_.get(),
- NULL,
+ nullptr,
0,
false,
1,
@@ -2379,7 +2379,7 @@ TEST_P(ResourceProviderTest, ManagedResource) {
scoped_ptr<ResourceProvider> resource_provider(
ResourceProvider::Create(output_surface.get(),
shared_bitmap_manager_.get(),
- NULL,
+ nullptr,
0,
false,
1,
@@ -2434,7 +2434,7 @@ TEST_P(ResourceProviderTest, TextureWrapMode) {
scoped_ptr<ResourceProvider> resource_provider(
ResourceProvider::Create(output_surface.get(),
shared_bitmap_manager_.get(),
- NULL,
+ nullptr,
0,
false,
1,
@@ -2493,7 +2493,7 @@ TEST_P(ResourceProviderTest, TextureHint) {
scoped_ptr<ResourceProvider> resource_provider(
ResourceProvider::Create(output_surface.get(),
shared_bitmap_manager_.get(),
- NULL,
+ nullptr,
0,
false,
1,
@@ -2574,7 +2574,7 @@ TEST_P(ResourceProviderTest, TextureMailbox_SharedMemory) {
uint32 release_sync_point = 0;
bool lost_resource = false;
- BlockingTaskRunner* main_thread_task_runner = NULL;
+ BlockingTaskRunner* main_thread_task_runner = nullptr;
scoped_ptr<SingleReleaseCallbackImpl> callback =
SingleReleaseCallbackImpl::Create(base::Bind(&ReleaseCallback,
&release_sync_point,
@@ -2638,7 +2638,7 @@ TEST_P(ResourceProviderTest, TextureMailbox_GLTexture2D) {
memcpy(gpu_mailbox.name, "Hello world", strlen("Hello world") + 1);
uint32 release_sync_point = 0;
bool lost_resource = false;
- BlockingTaskRunner* main_thread_task_runner = NULL;
+ BlockingTaskRunner* main_thread_task_runner = nullptr;
scoped_ptr<SingleReleaseCallbackImpl> callback =
SingleReleaseCallbackImpl::Create(base::Bind(&ReleaseCallback,
&release_sync_point,
@@ -2703,7 +2703,7 @@ TEST_P(ResourceProviderTest, TextureMailbox_GLTextureExternalOES) {
scoped_ptr<ResourceProvider> resource_provider(
ResourceProvider::Create(output_surface.get(),
shared_bitmap_manager_.get(),
- NULL,
+ nullptr,
0,
false,
1,
@@ -2778,7 +2778,7 @@ TEST_P(ResourceProviderTest,
scoped_ptr<ResourceProvider> resource_provider(
ResourceProvider::Create(output_surface.get(),
shared_bitmap_manager_.get(),
- NULL,
+ nullptr,
0,
false,
1,
@@ -2837,7 +2837,7 @@ TEST_P(ResourceProviderTest, TextureMailbox_WaitSyncPointIfNeeded_NoSyncPoint) {
scoped_ptr<ResourceProvider> resource_provider(
ResourceProvider::Create(output_surface.get(),
shared_bitmap_manager_.get(),
- NULL,
+ nullptr,
0,
false,
1,
@@ -2965,7 +2965,7 @@ TEST_P(ResourceProviderTest, TextureAllocation) {
scoped_ptr<ResourceProvider> resource_provider(
ResourceProvider::Create(output_surface.get(),
shared_bitmap_manager_.get(),
- NULL,
+ nullptr,
0,
false,
1,
@@ -3045,7 +3045,7 @@ TEST_P(ResourceProviderTest, TextureAllocationHint) {
scoped_ptr<ResourceProvider> resource_provider(
ResourceProvider::Create(output_surface.get(),
shared_bitmap_manager_.get(),
- NULL,
+ nullptr,
0,
false,
1,
@@ -3105,7 +3105,7 @@ TEST_P(ResourceProviderTest, TextureAllocationHint_BGRA) {
scoped_ptr<ResourceProvider> resource_provider(
ResourceProvider::Create(output_surface.get(),
shared_bitmap_manager_.get(),
- NULL,
+ nullptr,
0,
false,
1,
@@ -3164,7 +3164,7 @@ TEST_P(ResourceProviderTest, PixelBuffer_GLTexture) {
scoped_ptr<ResourceProvider> resource_provider(
ResourceProvider::Create(output_surface.get(),
shared_bitmap_manager_.get(),
- NULL,
+ nullptr,
0,
false,
1,
@@ -3211,7 +3211,7 @@ TEST_P(ResourceProviderTest, ForcingAsyncUploadToComplete) {
scoped_ptr<ResourceProvider> resource_provider(
ResourceProvider::Create(output_surface.get(),
shared_bitmap_manager_.get(),
- NULL,
+ nullptr,
0,
false,
1,
@@ -3258,7 +3258,7 @@ TEST_P(ResourceProviderTest, PixelBufferLostContext) {
scoped_ptr<ResourceProvider> resource_provider(
ResourceProvider::Create(output_surface.get(),
shared_bitmap_manager_.get(),
- NULL,
+ nullptr,
0,
false,
1,
@@ -3303,7 +3303,7 @@ TEST_P(ResourceProviderTest, Image_GLTexture) {
scoped_ptr<ResourceProvider> resource_provider(
ResourceProvider::Create(output_surface.get(),
shared_bitmap_manager_.get(),
- NULL,
+ nullptr,
0,
false,
1,
@@ -3416,7 +3416,7 @@ TEST_P(ResourceProviderTest, CopyResource_GLTexture) {
scoped_ptr<ResourceProvider> resource_provider(
ResourceProvider::Create(output_surface.get(),
shared_bitmap_manager_.get(),
- NULL,
+ nullptr,
0,
false,
1,
@@ -3513,13 +3513,14 @@ TEST(ResourceProviderTest, BasicInitializeGLSoftware) {
scoped_ptr<ResourceProvider> resource_provider(
ResourceProvider::Create(output_surface.get(),
shared_bitmap_manager.get(),
- NULL,
+ nullptr,
0,
false,
1,
false));
- CheckCreateResource(ResourceProvider::Bitmap, resource_provider.get(), NULL);
+ CheckCreateResource(
+ ResourceProvider::Bitmap, resource_provider.get(), nullptr);
InitializeGLAndCheck(shared_data.get(),
resource_provider.get(),
@@ -3527,7 +3528,8 @@ TEST(ResourceProviderTest, BasicInitializeGLSoftware) {
resource_provider->InitializeSoftware();
output_surface->ReleaseGL();
- CheckCreateResource(ResourceProvider::Bitmap, resource_provider.get(), NULL);
+ CheckCreateResource(
+ ResourceProvider::Bitmap, resource_provider.get(), nullptr);
InitializeGLAndCheck(shared_data.get(),
resource_provider.get(),
@@ -3552,7 +3554,7 @@ TEST_P(ResourceProviderTest, CompressedTextureETC1Allocate) {
scoped_ptr<ResourceProvider> resource_provider(
ResourceProvider::Create(output_surface.get(),
shared_bitmap_manager_.get(),
- NULL,
+ nullptr,
0,
false,
1,
@@ -3588,7 +3590,7 @@ TEST_P(ResourceProviderTest, CompressedTextureETC1SetPixels) {
scoped_ptr<ResourceProvider> resource_provider(
ResourceProvider::Create(output_surface.get(),
shared_bitmap_manager_.get(),
- NULL,
+ nullptr,
0,
false,
1,
@@ -3649,7 +3651,7 @@ TEST(ResourceProviderTest, TextureAllocationChunkSize) {
scoped_ptr<ResourceProvider> resource_provider(
ResourceProvider::Create(output_surface.get(),
shared_bitmap_manager.get(),
- NULL,
+ nullptr,
0,
false,
kTextureAllocationChunkSize,
@@ -3669,7 +3671,7 @@ TEST(ResourceProviderTest, TextureAllocationChunkSize) {
scoped_ptr<ResourceProvider> resource_provider(
ResourceProvider::Create(output_surface.get(),
shared_bitmap_manager.get(),
- NULL,
+ nullptr,
0,
false,
kTextureAllocationChunkSize,
« cc/resources/resource_provider.h ('K') | « cc/resources/resource_provider.cc ('k') | cc/resources/resource_update.cc » ('j') | cc/resources/single_release_callback.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698