Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Side by Side Diff: src/image/SkImage_Raster.cpp

Issue 1344663002: remove code from SK_SUPPORT_LEGACY_NEWFROMGENERATOR, eliminates caller of deprecated SkInstallDisca… (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/image/SkImage_Generator.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2012 Google Inc. 2 * Copyright 2012 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 "SkBitmap.h" 9 #include "SkBitmap.h"
10 #include "SkCanvas.h" 10 #include "SkCanvas.h"
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 // pixelref since the caller might call setImmutable() themselves 273 // pixelref since the caller might call setImmutable() themselves
274 // (thus changing our state). 274 // (thus changing our state).
275 if (fBitmap.isImmutable()) { 275 if (fBitmap.isImmutable()) {
276 bitmap->setInfo(fBitmap.info(), fBitmap.rowBytes()); 276 bitmap->setInfo(fBitmap.info(), fBitmap.rowBytes());
277 bitmap->setPixelRef(fBitmap.pixelRef(), fBitmap.pixelRefOrigin()); 277 bitmap->setPixelRef(fBitmap.pixelRef(), fBitmap.pixelRefOrigin());
278 return true; 278 return true;
279 } 279 }
280 } 280 }
281 return this->INHERITED::onAsLegacyBitmap(bitmap, mode); 281 return this->INHERITED::onAsLegacyBitmap(bitmap, mode);
282 } 282 }
283
284 #ifdef SK_SUPPORT_LEGACY_NEWFROMGENERATOR
285 SkImage* SkImage::NewFromGenerator(SkImageGenerator* generator, const SkIRect* s ubset) {
286 SkBitmap bitmap;
287 if (!SkInstallDiscardablePixelRef(generator, subset, &bitmap, nullptr)) {
288 return nullptr;
289 }
290 if (0 == bitmap.width() || 0 == bitmap.height()) {
291 return nullptr;
292 }
293 return new SkImage_Raster(bitmap, nullptr);
294 }
295 #endif
OLDNEW
« no previous file with comments | « src/image/SkImage_Generator.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698