gm/factory.cpp - Issue 346453002: Refactor how we handle resources path in Tests.

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/factory.cpp

Issue 346453002: Refactor how we handle resources path in Tests. (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: fix rebase conflict Created 6 years, 6 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/factory.cpp

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

index 9b7450e3a3229f936d645cd66fa854a0797824c0..641133c440430ffd5b373213b49f483f07a03bd6 100644

--- a/gm/factory.cpp

+++ b/gm/factory.cpp

@@ -6,6 +6,8 @@

#include "gm.h"

+#include "Resources.h"

#include "SkCanvas.h"

#include "SkData.h"

#include "SkDecodingImageGenerator.h"

@@ -27,8 +29,9 @@ public:

protected:

virtual void onOnceBeforeDraw() SK_OVERRIDE {

+ SkString resourcePath = GetResourcePath();

// Copyright-free file from http://openclipart.org/detail/29213/paper-plane-by-ddoo

- SkString filename = SkOSPath::SkPathJoin(INHERITED::gResourcePath, "plane.png");

+ SkString filename = SkOSPath::SkPathJoin(resourcePath.c_str(), "plane.png");

SkAutoDataUnref data(SkData::NewFromFileName(filename.c_str()));

if (NULL != data.get()) {

// Create a cache which will boot the pixels out anytime the

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