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/filterbitmap.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'gm/filterbitmap.cpp') diff --git a/gm/filterbitmap.cpp b/gm/filterbitmap.cpp index 351fb2aaf7..d73318d31c 100644 --- a/gm/filterbitmap.cpp +++ b/gm/filterbitmap.cpp @@ -6,11 +6,12 @@ */ #include "gm.h" -#include "SkGradientShader.h" -#include "SkTypeface.h" +#include "Resources.h" +#include "SkGradientShader.h" #include "SkImageDecoder.h" #include "SkStream.h" +#include "SkTypeface.h" static void setTypeface(SkPaint* paint, const char name[], SkTypeface::Style style) { SkSafeUnref(paint->setTypeface(SkTypeface::CreateFromName(name, style))); @@ -193,12 +194,12 @@ class FilterBitmapImageGM: public FilterBitmapGM { } void makeBitmap() SK_OVERRIDE { - SkString path(skiagm::GM::gResourcePath); - path.append("/"); - path.append(fFilename); + SkString resourcePath = GetResourcePath(); + resourcePath.append("/"); + resourcePath.append(fFilename); - SkImageDecoder *codec = NULL; - SkFILEStream stream(path.c_str()); + SkImageDecoder* codec = NULL; + SkFILEStream stream(resourcePath.c_str()); if (stream.isValid()) { codec = SkImageDecoder::Factory(&stream); } -- cgit v1.2.3