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

Chromium Code Reviews

chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out

(899)

My Issues | Starred Open | Closed | All

Unified Diff: gm/coloremoji.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:

View side-by-side diff with in-line comments

« no previous file with comments | « gm/cmykjpeg.cpp ('k') | gm/copyTo4444.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gm/coloremoji.cpp

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

index 39c70bd70767a7047b32af1aa13d29d9553f215c..cf4500819a45233ecbe9bea8f3ebe6786b599402 100644

--- a/gm/coloremoji.cpp

+++ b/gm/coloremoji.cpp

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

*/

#include "gm.h"

+

+#include "Resources.h"

#include "SkCanvas.h"

#include "SkStream.h"

#include "SkTypeface.h"

@@ -27,8 +29,7 @@ protected:

}

virtual void onOnceBeforeDraw() SK_OVERRIDE {

-

- SkString filename(INHERITED::gResourcePath);

+ SkString filename = GetResourcePath();

filename.append("/Funkster.ttf");

SkAutoTUnref<SkFILEStream> stream(new SkFILEStream(filename.c_str()));

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

Powered by Google App Engine

This is Rietveld 408576698