From bcbc1788b478b1e54079318ad073e8490aa66fae Mon Sep 17 00:00:00 2001 From: tfarina Date: Wed, 18 Jun 2014 14:32:48 -0700 Subject: Refactor how we handle resources path in Tests. This idea emerged while doing https://codereview.chromium.org/321723002/ (commit 880914c35c8f7fc2e9c57134134c883baf66e538). BUG=None TEST=make tests && out/Debug/tests R=mtklein@google.com Author: tfarina@chromium.org Review URL: https://codereview.chromium.org/346453002 --- gm/coloremoji.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gm/coloremoji.cpp') diff --git a/gm/coloremoji.cpp b/gm/coloremoji.cpp index 39c70bd707..cf4500819a 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 stream(new SkFILEStream(filename.c_str())); -- cgit v1.2.3