Roll Skia to 7b971f0152299ae9a924252a9bfd220318497bdd

sky/engine/platform/graphics/skia/GaneshUtils.cpp

 /*
  * Copyright (c) 2013, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 24 matching lines @@
 
 namespace blink {
 
 bool ensureTextureBackedSkBitmap(GrContext* gr, SkBitmap& bitmap, const IntSize& size, GrSurfaceOrigin origin, GrPixelConfig config)
 {
     if (!bitmap.getTexture() || bitmap.width() != size.width() || bitmap.height() != size.height()) {
         if (!gr)
             return false;
         GrTextureDesc desc;
         desc.fConfig = config;
-        desc.fFlags = kRenderTarget_GrTextureFlagBit | kNoStencil_GrTextureFlagBit;
+        desc.fFlags = kRenderTarget_GrSurfaceFlag;
         desc.fSampleCnt = 0;
         desc.fOrigin = origin;
         desc.fWidth = size.width();
         desc.fHeight = size.height();
-        SkAutoTUnref<GrTexture> texture(gr->createUncachedTexture(desc, 0, 0));
+        SkAutoTUnref<GrTexture> texture(gr->textureProvider()->createTexture(desc, false, 0, 0));
         if (!texture.get())
             return false;
 
         SkImageInfo info = SkImageInfo::MakeN32Premul(desc.fWidth, desc.fHeight);
         SkGrPixelRef* pixelRef = SkNEW_ARGS(SkGrPixelRef, (info, texture.get()));
         if (!pixelRef)
             return false;
         bitmap.setInfo(info);
         bitmap.setPixelRef(pixelRef)->unref();
     }
 
     return true;
 }
 
 } // namespace blink