cc/layers/delegated_renderer_layer_impl_unittest.cc - Issue 643583003: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr in src/…

Unified Diff: cc/layers/delegated_renderer_layer_impl_unittest.cc

Issue 643583003: [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: Presubmit fix 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

Index: cc/layers/delegated_renderer_layer_impl_unittest.cc

diff --git a/cc/layers/delegated_renderer_layer_impl_unittest.cc b/cc/layers/delegated_renderer_layer_impl_unittest.cc

index 832a483bf06d938561353c0e357a5ee127924e0f..26e0aec8065adc7fc8556998dffbbc29ee3b6767 100644

--- a/cc/layers/delegated_renderer_layer_impl_unittest.cc

+++ b/cc/layers/delegated_renderer_layer_impl_unittest.cc

@@ -692,8 +692,8 @@ TEST_F(DelegatedRendererLayerImplTestTransform, QuadsUnclipped_NoSurface) {

LayerTreeHostImpl::FrameData frame;

EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));

- const SharedQuadState* root_delegated_shared_quad_state = NULL;

- const SharedQuadState* contrib_delegated_shared_quad_state = NULL;

+ const SharedQuadState* root_delegated_shared_quad_state = nullptr;

+ const SharedQuadState* contrib_delegated_shared_quad_state = nullptr;

VerifyRenderPasses(

frame,

@@ -747,8 +747,8 @@ TEST_F(DelegatedRendererLayerImplTestTransform, QuadsClipped_NoSurface) {

LayerTreeHostImpl::FrameData frame;

EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));

- const SharedQuadState* root_delegated_shared_quad_state = NULL;

- const SharedQuadState* contrib_delegated_shared_quad_state = NULL;

+ const SharedQuadState* root_delegated_shared_quad_state = nullptr;

+ const SharedQuadState* contrib_delegated_shared_quad_state = nullptr;

VerifyRenderPasses(

frame,

@@ -808,8 +808,8 @@ TEST_F(DelegatedRendererLayerImplTestTransform, QuadsUnclipped_Surface) {

LayerTreeHostImpl::FrameData frame;

EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));

- const SharedQuadState* root_delegated_shared_quad_state = NULL;

- const SharedQuadState* contrib_delegated_shared_quad_state = NULL;

+ const SharedQuadState* root_delegated_shared_quad_state = nullptr;

+ const SharedQuadState* contrib_delegated_shared_quad_state = nullptr;

VerifyRenderPasses(

frame,

@@ -856,8 +856,8 @@ TEST_F(DelegatedRendererLayerImplTestTransform, QuadsClipped_Surface) {

LayerTreeHostImpl::FrameData frame;

EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));

- const SharedQuadState* root_delegated_shared_quad_state = NULL;

- const SharedQuadState* contrib_delegated_shared_quad_state = NULL;

+ const SharedQuadState* root_delegated_shared_quad_state = nullptr;

+ const SharedQuadState* contrib_delegated_shared_quad_state = nullptr;

VerifyRenderPasses(

frame,

@@ -903,8 +903,8 @@ TEST_F(DelegatedRendererLayerImplTestTransform, MismatchedDeviceScaleFactor) {

LayerTreeHostImpl::FrameData frame;

EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));

- const SharedQuadState* root_delegated_shared_quad_state = NULL;

- const SharedQuadState* contrib_delegated_shared_quad_state = NULL;

+ const SharedQuadState* root_delegated_shared_quad_state = nullptr;

+ const SharedQuadState* contrib_delegated_shared_quad_state = nullptr;

VerifyRenderPasses(frame,

&root_delegated_shared_quad_state,

« no previous file with comments | « cc/layers/delegated_renderer_layer_impl.cc ('k') | cc/layers/draw_properties.h » ('j') | cc/layers/texture_layer_unittest.cc » ('J')