gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h - Issue 375733004: Fixes for re-enabling more MSVC level 4 warnings: gpu/ edition

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h

Issue 375733004: Fixes for re-enabling more MSVC level 4 warnings: gpu/ edition (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix compile Created 6 years, 5 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:

Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h

diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h

index cc7904bd900277f7fc25403ade25131c0096baef..4b4f104e47aff363bb2115beba6a824ee5e6fcc7 100644

--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h

+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h

@@ -347,8 +347,7 @@ class GLES2DecoderTestBase : public ::testing::TestWithParam<bool> {

bool green,

bool blue,

bool alpha);

- void SetupExpectationsForStencilMask(uint32 front_mask,

- uint32 back_mask);

+ void SetupExpectationsForStencilMask(GLuint front_mask, GLuint back_mask);

void SetupExpectationsForApplyingDirtyState(

bool framebuffer_is_rgb,

@@ -536,8 +535,8 @@ class GLES2DecoderTestBase : public ::testing::TestWithParam<bool> {

bool cached_color_mask_blue_;

bool cached_color_mask_alpha_;

bool cached_depth_mask_;

- uint32 cached_stencil_front_mask_;

- uint32 cached_stencil_back_mask_;

+ GLuint cached_stencil_front_mask_;

+ GLuint cached_stencil_back_mask_;

struct EnableFlags {

EnableFlags();