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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/output/gl_renderer_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
« no previous file with comments | « cc/output/gl_renderer.cc ('k') | cc/output/output_surface.cc » ('j') | cc/output/software_output_device.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/gl_renderer_unittest.cc
diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc
index 45b6d2ab989a9c727ec5642b81042f1393a5f2b1..f1ee29f78d372d5ea8e0bccd64fe6753e9391482 100644
--- a/cc/output/gl_renderer_unittest.cc
+++ b/cc/output/gl_renderer_unittest.cc
@@ -132,7 +132,7 @@ class FakeRendererGL : public GLRenderer {
settings,
output_surface,
resource_provider,
- NULL,
+ nullptr,
0) {}
// GLRenderer methods.
@@ -155,7 +155,7 @@ class GLRendererWithDefaultHarnessTest : public GLRendererTest {
shared_bitmap_manager_.reset(new TestSharedBitmapManager());
resource_provider_ = ResourceProvider::Create(output_surface_.get(),
shared_bitmap_manager_.get(),
- NULL,
+ nullptr,
0,
false,
1,
@@ -191,7 +191,7 @@ class GLRendererShaderTest : public GLRendererTest {
shared_bitmap_manager_.reset(new TestSharedBitmapManager());
resource_provider_ = ResourceProvider::Create(output_surface_.get(),
shared_bitmap_manager_.get(),
- NULL,
+ nullptr,
0,
false,
1,
@@ -484,7 +484,7 @@ TEST_F(GLRendererTest, InitializationDoesNotMakeSynchronousCalls) {
scoped_ptr<ResourceProvider> resource_provider(
ResourceProvider::Create(output_surface.get(),
shared_bitmap_manager.get(),
- NULL,
+ nullptr,
0,
false,
1,
@@ -526,7 +526,7 @@ TEST_F(GLRendererTest, InitializationWithQuicklyLostContextDoesNotAssert) {
scoped_ptr<ResourceProvider> resource_provider(
ResourceProvider::Create(output_surface.get(),
shared_bitmap_manager.get(),
- NULL,
+ nullptr,
0,
false,
1,
@@ -565,7 +565,7 @@ TEST_F(GLRendererTest, OpaqueBackground) {
scoped_ptr<ResourceProvider> resource_provider(
ResourceProvider::Create(output_surface.get(),
shared_bitmap_manager.get(),
- NULL,
+ nullptr,
0,
false,
1,
@@ -617,7 +617,7 @@ TEST_F(GLRendererTest, TransparentBackground) {
scoped_ptr<ResourceProvider> resource_provider(
ResourceProvider::Create(output_surface.get(),
shared_bitmap_manager.get(),
- NULL,
+ nullptr,
0,
false,
1,
@@ -662,7 +662,7 @@ TEST_F(GLRendererTest, OffscreenOutputSurface) {
scoped_ptr<ResourceProvider> resource_provider(
ResourceProvider::Create(output_surface.get(),
shared_bitmap_manager.get(),
- NULL,
+ nullptr,
0,
false,
1,
@@ -749,7 +749,7 @@ TEST_F(GLRendererTest, VisibilityChangeIsLastCall) {
scoped_ptr<ResourceProvider> resource_provider(
ResourceProvider::Create(output_surface.get(),
shared_bitmap_manager.get(),
- NULL,
+ nullptr,
0,
false,
1,
@@ -820,7 +820,7 @@ TEST_F(GLRendererTest, ActiveTextureState) {
scoped_ptr<ResourceProvider> resource_provider(
ResourceProvider::Create(output_surface.get(),
shared_bitmap_manager.get(),
- NULL,
+ nullptr,
0,
false,
1,
@@ -911,7 +911,7 @@ TEST_F(GLRendererTest, ShouldClearRootRenderPass) {
scoped_ptr<ResourceProvider> resource_provider(
ResourceProvider::Create(output_surface.get(),
shared_bitmap_manager.get(),
- NULL,
+ nullptr,
0,
false,
1,
@@ -1009,7 +1009,7 @@ TEST_F(GLRendererTest, ScissorTestWhenClearing) {
scoped_ptr<ResourceProvider> resource_provider(
ResourceProvider::Create(output_surface.get(),
shared_bitmap_manager.get(),
- NULL,
+ nullptr,
0,
false,
1,
@@ -1107,7 +1107,7 @@ TEST_F(GLRendererTest, NoDiscardOnPartialUpdates) {
scoped_ptr<ResourceProvider> resource_provider(
ResourceProvider::Create(output_surface.get(),
shared_bitmap_manager.get(),
- NULL,
+ nullptr,
0,
false,
1,
@@ -1298,7 +1298,7 @@ TEST_F(GLRendererTest, ScissorAndViewportWithinNonreshapableSurface) {
scoped_ptr<ResourceProvider> resource_provider(
ResourceProvider::Create(output_surface.get(),
shared_bitmap_manager.get(),
- NULL,
+ nullptr,
0,
false,
1,
@@ -1367,7 +1367,7 @@ TEST_F(GLRendererShaderTest, DrawRenderPassQuadShaderPermutations) {
skia::RefPtr<SkColorFilter> color_filter(
skia::AdoptRef(SkColorMatrixFilter::Create(matrix)));
skia::RefPtr<SkImageFilter> filter = skia::AdoptRef(
- SkColorFilterImageFilter::Create(color_filter.get(), NULL));
+ SkColorFilterImageFilter::Create(color_filter.get(), nullptr));
FilterOperations filters;
filters.Append(FilterOperation::CreateReferenceFilter(filter));
@@ -1677,7 +1677,7 @@ class MockOutputSurfaceTest : public GLRendererTest {
shared_bitmap_manager_.reset(new TestSharedBitmapManager());
resource_provider_ = ResourceProvider::Create(&output_surface_,
shared_bitmap_manager_.get(),
- NULL,
+ nullptr,
0,
false,
1,
« no previous file with comments | « cc/output/gl_renderer.cc ('k') | cc/output/output_surface.cc » ('j') | cc/output/software_output_device.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698