OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2015 Google Inc. | 2 * Copyright 2015 Google Inc. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
6 */ | 6 */ |
7 | 7 |
8 #include "SkImage_Base.h" | 8 #include "SkImage_Base.h" |
9 #include "SkImageGenerator.h" | 9 #include "SkImageGenerator.h" |
10 #include "SkCanvas.h" | 10 #include "SkCanvas.h" |
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
144 if (!surface.get()) { | 144 if (!surface.get()) { |
145 return nullptr; | 145 return nullptr; |
146 } | 146 } |
147 | 147 |
148 SkMatrix matrix = fMatrix; | 148 SkMatrix matrix = fMatrix; |
149 if (subset) { | 149 if (subset) { |
150 matrix.postTranslate(-subset->x(), -subset->y()); | 150 matrix.postTranslate(-subset->x(), -subset->y()); |
151 } | 151 } |
152 surface->getCanvas()->clear(0); // does NewRenderTarget promise to do this f
or us? | 152 surface->getCanvas()->clear(0); // does NewRenderTarget promise to do this f
or us? |
153 surface->getCanvas()->drawPicture(fPicture, &matrix, fPaint.getMaybeNull()); | 153 surface->getCanvas()->drawPicture(fPicture, &matrix, fPaint.getMaybeNull()); |
154 SkAutoTUnref<SkImage> image(surface->newImageSnapshot()); | 154 sk_sp<SkImage> image(surface->makeImageSnapshot()); |
155 if (!image.get()) { | 155 if (!image) { |
156 return nullptr; | 156 return nullptr; |
157 } | 157 } |
158 return SkSafeRef(as_IB(image)->peekTexture()); | 158 return SkSafeRef(as_IB(image)->peekTexture()); |
159 } | 159 } |
160 #endif | 160 #endif |
OLD | NEW |