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

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

Issue 1775263004: Restore SkImage::NewTextureFromPixmap changes. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 9 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/gpu/SkGrPriv.h ('k') | src/image/SkImage_Gpu.cpp » ('j') | 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 "SkBitmap.h" 8 #include "SkBitmap.h"
9 #include "SkBitmapCache.h" 9 #include "SkBitmapCache.h"
10 #include "SkCanvas.h" 10 #include "SkCanvas.h"
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 } 341 }
342 342
343 bool SkImage::isLazyGenerated() const { 343 bool SkImage::isLazyGenerated() const {
344 return as_IB(this)->onIsLazyGenerated(); 344 return as_IB(this)->onIsLazyGenerated();
345 } 345 }
346 346
347 //////////////////////////////////////////////////////////////////////////////// ////// 347 //////////////////////////////////////////////////////////////////////////////// //////
348 348
349 #if !SK_SUPPORT_GPU 349 #if !SK_SUPPORT_GPU
350 350
351 SkImage* SkImage::NewTextureFromPixmap(GrContext*, const SkPixmap&, SkBudgeted b udgeted) {
352 return nullptr;
353 }
354
351 SkImage* SkImage::NewFromTexture(GrContext*, const GrBackendTextureDesc&, SkAlph aType, 355 SkImage* SkImage::NewFromTexture(GrContext*, const GrBackendTextureDesc&, SkAlph aType,
352 TextureReleaseProc, ReleaseContext) { 356 TextureReleaseProc, ReleaseContext) {
353 return nullptr; 357 return nullptr;
354 } 358 }
355 359
356 SkImage* SkImage::NewFromAdoptedTexture(GrContext*, const GrBackendTextureDesc&, SkAlphaType) { 360 SkImage* SkImage::NewFromAdoptedTexture(GrContext*, const GrBackendTextureDesc&, SkAlphaType) {
357 return nullptr; 361 return nullptr;
358 } 362 }
359 363
360 SkImage* SkImage::NewFromTextureCopy(GrContext*, const GrBackendTextureDesc&, Sk AlphaType) { 364 SkImage* SkImage::NewFromTextureCopy(GrContext*, const GrBackendTextureDesc&, Sk AlphaType) {
361 return nullptr; 365 return nullptr;
362 } 366 }
363 367
364 SkImage* SkImage::newTextureImage(GrContext*) const { 368 SkImage* SkImage::newTextureImage(GrContext*) const {
365 return nullptr; 369 return nullptr;
366 } 370 }
367 371
368 #endif 372 #endif
OLDNEW
« no previous file with comments | « src/gpu/SkGrPriv.h ('k') | src/image/SkImage_Gpu.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698