gm/image.cpp - Issue 23567032: Have GMs read the GrContext via a setter/getter rather than a global.

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: gm/image.cpp

Issue 23567032: Have GMs read the GrContext via a setter/getter rather than a global. (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: use Brian's suggestion Created 7 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:

Index: gm/image.cpp

diff --git a/gm/image.cpp b/gm/image.cpp

index 3ed85f9bab7ca4653e6297ddec73e3d59c61b849..6dada0d9492c14c93fe4e275c810d363d9e0cf39 100644

--- a/gm/image.cpp

+++ b/gm/image.cpp

@@ -13,10 +13,6 @@

#if SK_SUPPORT_GPU

#include "GrContext.h"

-namespace skiagm {

-extern GrContext* GetGr();

-};

#endif

static SkData* fileToData(const char path[]) {

@@ -193,7 +189,7 @@ protected:

SkAutoTUnref<SkSurface> surf2(SkSurface::NewPicture(info.fWidth, info.fHeight));

SkAutoTUnref<SkSurface> surf3(SkSurface::NewPicture(info.fWidth, info.fHeight));

#if SK_SUPPORT_GPU

- GrContext* ctx = skiagm::GetGr();

+ GrContext* ctx = GM::GetGr(canvas);

SkAutoTUnref<SkSurface> surf4(SkSurface::NewRenderTarget(ctx, info, 0));

#endif

« no previous file with comments | « gm/gmmain.cpp ('k') | gm/texdata.cpp » ('j') | no next file with comments »