gpu/command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc - Issue 1542513002: Switch to standard integer types in gpu/.

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/tests/gl_chromium_framebuffer_multisample_unittest.cc

Issue 1542513002: Switch to standard integer types in gpu/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix Created 5 years 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 | « gpu/command_buffer/tests/gl_bind_uniform_location_unittest.cc ('k') | gpu/command_buffer/tests/gl_chromium_path_rendering_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gpu/command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc

diff --git a/gpu/command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc b/gpu/command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc

index 8268b6689d9b4ca914ab8a630d62211988e65e66..ece687101baf0a1494b1c8f223c76535d6e540ce 100644

--- a/gpu/command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc

+++ b/gpu/command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc

@@ -5,6 +5,7 @@

#include <GLES2/gl2.h>

#include <GLES2/gl2ext.h>

#include <GLES2/gl2extchromium.h>

+#include <stdint.h>

#include "gpu/command_buffer/tests/gl_manager.h"

#include "gpu/command_buffer/tests/gl_test_utils.h"

@@ -146,8 +147,8 @@ TEST_F(GLChromiumFramebufferMultisampleTest, DrawAndResolve) {

GL_NEAREST);

// Verify.

- const uint8 green[] = {0, 255, 0, 255};

- const uint8 black[] = {0, 0, 0, 0};

+ const uint8_t green[] = {0, 255, 0, 255};

+ const uint8_t black[] = {0, 0, 0, 0};

glBindFramebuffer(GL_READ_FRAMEBUFFER, resolve_fbo);

EXPECT_TRUE(

GLTestHelper::CheckPixels(width / 4, (3 * height) / 4, 1, 1, 0, green));