gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc - Issue 566023002: Clean up interfaces between Shader / ShaderTranslator / ANGLE side.

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_2.cc

Issue 566023002: Clean up interfaces between Shader / ShaderTranslator / ANGLE side. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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 | « gpu/command_buffer/service/gles2_cmd_decoder_unittest_1.cc ('k') | gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc

diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc

index 221aa332a488993bc3a2a40030563a4a49b1aef7..1d8ac4076de6f4d06e0d54701ed63c718e4541cc 100644

--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc

+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc

@@ -10,6 +10,7 @@

#include "gpu/command_buffer/service/cmd_buffer_engine.h"

#include "gpu/command_buffer/service/context_group.h"

#include "gpu/command_buffer/service/program_manager.h"

+#include "gpu/command_buffer/service/test_helper.h"

#include "testing/gtest/include/gtest/gtest.h"

#include "ui/gl/gl_mock.h"

@@ -289,8 +290,10 @@ void GLES2DecoderTestBase::SpecializedSetup<cmds::LinkProgram, 0>(

DoCreateShader(

GL_FRAGMENT_SHADER, kClientFragmentShaderId, kServiceFragmentShaderId);

- GetShader(kClientVertexShaderId)->SetStatus(true, "", NULL);

- GetShader(kClientFragmentShaderId)->SetStatus(true, "", NULL);

+ TestHelper::SetShaderStates(

+ gl_.get(), GetShader(kClientVertexShaderId), true);

+ TestHelper::SetShaderStates(

+ gl_.get(), GetShader(kClientFragmentShaderId), true);

InSequence dummy;

EXPECT_CALL(*gl_,