gm/etc1bitmap.cpp - Issue 321723002: Reland "Clean up Test's resourcePath code."

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

Issue 321723002: Reland "Clean up Test's resourcePath code." (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: ETCBitmapBench fix 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/etc1bitmap.cpp

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

index cdf8617a35627e317feb96de0ea8e09148265af0..ce0aa7dbad6e3018ff58b404635c88d5383b6b48 100644

--- a/gm/etc1bitmap.cpp

+++ b/gm/etc1bitmap.cpp

@@ -93,8 +93,7 @@ protected:

virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {

SkBitmap bm;

- SkString filename = SkOSPath::SkPathJoin(

- INHERITED::gResourcePath.c_str(), "mandrill_128.");

+ SkString filename = SkOSPath::SkPathJoin(INHERITED::gResourcePath, "mandrill_128.");

filename.append(this->fileExtension());

SkAutoTUnref<SkData> fileData(SkData::NewFromFileName(filename.c_str()));

@@ -169,8 +168,7 @@ protected:

virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {

SkBitmap bm;

- SkString filename = SkOSPath::SkPathJoin(

- INHERITED::gResourcePath.c_str(), "mandrill_128.pkm");

+ SkString filename = SkOSPath::SkPathJoin(INHERITED::gResourcePath, "mandrill_128.pkm");

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

if (NULL == fileData) {

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