cc/CCRendererGL.cpp - Issue 10968047: cc_unittests fails on several platforms with 158148

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: cc/CCRendererGL.cpp

Issue 10968047: cc_unittests fails on several platforms with 158148 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 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

Index: cc/CCRendererGL.cpp

===================================================================

--- cc/CCRendererGL.cpp (revision 158168)

+++ cc/CCRendererGL.cpp (working copy)

@@ -284,9 +284,6 @@

ASSERT(program && program->initialized());

GLC(context(), context()->useProgram(program->program()));

- SkColor color = quad->color();

- GLC(context(), context()->uniform4f(program->fragmentShader().colorLocation(), SkColorGetR(color) / 255.0, SkColorGetG(color) / 255.0, SkColorGetB(color) / 255.0, 1));

IntRect tileRect = quad->quadRect();

float texOffsetX = tileRect.x();

float texOffsetY = tileRect.y();

« no previous file with comments | « cc/CCRenderPassTest.cpp ('k') | cc/CCTiledLayerImpl.h » ('j') | no next file with comments »