Upstream version 9.38.198.0

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

diff --git a/src/third_party/skia/gm/xfermodes3.cpp b/src/third_party/skia/gm/xfermodes3.cpp
index 92367f3..e3e1629 100644 (file)
--- a/src/third_party/skia/gm/xfermodes3.cpp
+++ b/src/third_party/skia/gm/xfermodes3.cpp
@@ -46,6 +46,7 @@ protected:
 
         SkPaint labelP;
         labelP.setAntiAlias(true);
+        sk_tool_utils::set_portable_typeface(&labelP);
 
         static const SkColor kSolidColors[] = {
             SK_ColorTRANSPARENT,
@@ -123,13 +124,12 @@ private:
     SkCanvas* possiblyCreateTempCanvas(SkCanvas* baseCanvas, int w, int h) {
         SkCanvas* tempCanvas = NULL;
 #if SK_SUPPORT_GPU
-        GrRenderTarget* rt = baseCanvas->getDevice()->accessRenderTarget();
-        if (NULL != rt) {
-            GrContext* context = rt->getContext();
+        GrContext* context = baseCanvas->getGrContext();
+        if (NULL != context) {
             GrTextureDesc desc;
             desc.fWidth = w;
             desc.fHeight = h;
-            desc.fConfig = rt->config();
+            desc.fConfig = SkImageInfo2GrPixelConfig(baseCanvas->imageInfo());
             desc.fFlags = kRenderTarget_GrTextureFlagBit;
             SkAutoTUnref<GrSurface> surface(context->createUncachedTexture(desc, NULL, 0));
             SkAutoTUnref<SkBaseDevice> device(SkGpuDevice::Create(surface.get()));