commit f87da67df90968adcddb2404ff20a41fe49a0315
author Derek Sollenberger <djsollen@google.com> Wed Nov 02 11:34:27 2016 -0400
committer Derek Sollenberger <djsollen@google.com> Wed Nov 02 11:37:13 2016 -0400
tree 39f58352183926b9e5e407633faeacbb81909ef5
parent c2f31df8b3b9a237e9abffc59c61804ad8495073

Adding changes required by the master-skia merge.

Test: compile only
Change-Id: I39637a20da439edbf2831952df9bfa12da78e9b9

libs/hwui/pipeline/skia/LayerDrawable.cpp

diff --git a/libs/hwui/pipeline/skia/LayerDrawable.cpp b/libs/hwui/pipeline/skia/LayerDrawable.cpp
index f8a181f..13a0ed8 100644
--- a/libs/hwui/pipeline/skia/LayerDrawable.cpp
+++ b/libs/hwui/pipeline/skia/LayerDrawable.cpp
@@ -15,6 +15,7 @@
  */
 
 #include "LayerDrawable.h"
+#include "SkColorFilter.h"
 #include "gl/GrGLTypes.h"
 
 namespace android {
@@ -40,12 +41,12 @@
     textureDescription.fConfig = kRGBA_8888_GrPixelConfig;
     textureDescription.fOrigin = kTopLeft_GrSurfaceOrigin;
     textureDescription.fTextureHandle = reinterpret_cast<GrBackendObject>(&externalTexture);
-    sk_sp<SkImage> layerImage(SkImage::NewFromTexture(context, textureDescription));
+    sk_sp<SkImage> layerImage = SkImage::MakeFromTexture(context, textureDescription);
     if (layerImage) {
         SkPaint paint;
         paint.setAlpha(mLayer->getAlpha());
         paint.setBlendMode(mLayer->getMode());
-        paint.setColorFilter(mLayer->getColorFilter());
+        paint.setColorFilter(sk_ref_sp(mLayer->getColorFilter()));
         canvas->drawImage(layerImage, 0, 0, &paint);
     }
     // restore the original matrix