commit 12f77343ee645d7b96e5d6a78370e5f5a38eaea4
author Mike Reed <reed@google.com> Wed Nov 08 11:19:52 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Nov 08 16:40:47 2017 +0000
tree 26d4e05886418d47b52ec1eae2230f86967d86c6
parent 70d2f43d82c32e0114789f20926b16b5bd86a445

add surfaceprops param to SkCanvas::MakeRasterDirect

Bug: skia:
Change-Id: I8b69280469cdf34c3c3cb126db9457a712143f88
Reviewed-on: https://skia-review.googlesource.com/68701
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>

src/core/SkCanvas.cpp

diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index fdfd5a4..445ad05 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -2892,7 +2892,7 @@
 }
 
 std::unique_ptr<SkCanvas> SkCanvas::MakeRasterDirect(const SkImageInfo& info, void* pixels,
-                                                     size_t rowBytes) {
+                                                     size_t rowBytes, const SkSurfaceProps* props) {
     if (!supported_for_raster_canvas(info)) {
         return nullptr;
     }
@@ -2901,7 +2901,10 @@
     if (!bitmap.installPixels(info, pixels, rowBytes)) {
         return nullptr;
     }
-    return skstd::make_unique<SkCanvas>(bitmap);
+
+    return props ?
+        skstd::make_unique<SkCanvas>(bitmap, *props) :
+        skstd::make_unique<SkCanvas>(bitmap);
 }
 
 ///////////////////////////////////////////////////////////////////////////////