src/gpu/gl/GrGLSL.cpp - Issue 216503004: SK_SUPPORT_LEGACY_GRTYPES to hide duplicate types from SkTypes.h

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: src/gpu/gl/GrGLSL.cpp

Issue 216503004: SK_SUPPORT_LEGACY_GRTYPES to hide duplicate types from SkTypes.h (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: Created 6 years, 9 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: src/gpu/gl/GrGLSL.cpp

diff --git a/src/gpu/gl/GrGLSL.cpp b/src/gpu/gl/GrGLSL.cpp

index a7948cc4bcd4f98af5ba7c682d255d29d2b7712d..1ff0850a1db5d89768894f6aed5c1f4e53630ce0 100644

--- a/src/gpu/gl/GrGLSL.cpp

+++ b/src/gpu/gl/GrGLSL.cpp

@@ -67,7 +67,7 @@ namespace {

void append_tabs(SkString* outAppend, int tabCnt) {

static const char kTabs[] = "\t\t\t\t\t\t\t\t";

while (tabCnt) {

- int cnt = GrMin((int)GR_ARRAY_COUNT(kTabs), tabCnt);

+ int cnt = SkTMin((int)SK_ARRAY_COUNT(kTabs), tabCnt);

outAppend->append(kTabs, cnt);

tabCnt -= cnt;

}