Upstream version 9.38.198.0

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

diff --git a/src/third_party/skia/gm/tilemodes_scaled.cpp b/src/third_party/skia/gm/tilemodes_scaled.cpp
index 88a070a..360539c 100644 (file)
--- a/src/third_party/skia/gm/tilemodes_scaled.cpp
+++ b/src/third_party/skia/gm/tilemodes_scaled.cpp
@@ -65,13 +65,6 @@ protected:
         kNPOTSize = 3,
     };
 
-    virtual uint32_t onGetFlags() const SK_OVERRIDE {
-        if (!fPowerOfTwoSize) {
-            return kSkipTiled_Flag;  // Only for 565.  8888 is fine.
-        }
-        return 0;
-    }
-
     SkString onShortName() {
         SkString name("scaled_tilemodes");
         if (!fPowerOfTwoSize) {
@@ -117,6 +110,7 @@ protected:
                 SkPaint p;
                 SkString str;
                 p.setAntiAlias(true);
+                sk_tool_utils::set_portable_typeface(&p);
                 p.setDither(true);
                 p.setLooper(fLooper);
                 str.printf("[%s,%s]", gModeNames[kx], gModeNames[ky]);
@@ -158,6 +152,7 @@ protected:
                     SkPaint p;
                     SkString str;
                     p.setAntiAlias(true);
+                    sk_tool_utils::set_portable_typeface(&p);
                     p.setLooper(fLooper);
                     str.printf("%s, %s", gColorTypeNames[i], gFilterNames[j]);
                     canvas->drawText(str.c_str(), str.size(), scale*x, scale*(y + r.height() * 2 / 3), p);
@@ -241,6 +236,7 @@ protected:
 
         SkPaint p;
         p.setAntiAlias(true);
+        sk_tool_utils::set_portable_typeface(&p);
         p.setTextAlign(SkPaint::kCenter_Align);
 
         for (size_t kx = 0; kx < SK_ARRAY_COUNT(gModes); kx++) {