Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / gm / downsamplebitmap.cpp

diff --git a/src/third_party/skia/gm/downsamplebitmap.cpp b/src/third_party/skia/gm/downsamplebitmap.cpp
index a911b83..4cde4bd 100644 (file)
--- a/src/third_party/skia/gm/downsamplebitmap.cpp
+++ b/src/third_party/skia/gm/downsamplebitmap.cpp
@@ -15,7 +15,7 @@
 #include "SkPaint.h"
 
 static void setTypeface(SkPaint* paint, const char name[], SkTypeface::Style style) {
-    SkSafeUnref(paint->setTypeface(SkTypeface::CreateFromName(name, style)));
+    sk_tool_utils::set_portable_typeface(paint, name, style);
 }
 
 class DownsampleBitmapGM : public skiagm::GM {
@@ -172,11 +172,8 @@ class DownsampleBitmapImageGM: public DownsampleBitmapGM {
       int fSize;
 
       virtual void make_bitmap() SK_OVERRIDE {
-          SkString resourcePath = GetResourcePath();
-          resourcePath.append("/");
-          resourcePath.append(fFilename);
-
           SkImageDecoder* codec = NULL;
+          SkString resourcePath = GetResourcePath(fFilename.c_str());
           SkFILEStream stream(resourcePath.c_str());
           if (stream.isValid()) {
               codec = SkImageDecoder::Factory(&stream);