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

Side by Side Diff: src/core/SkBitmapProvider.cpp

Issue 1893203006: Make all the codecs default profiles based on gDefaultProfileIsSRGB. (Closed) Base URL: https://skia.googlesource.com/skia.git@add-imageinfo-to-SkImage_Base
Patch Set: Make private work. Created 4 years, 8 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
OLDNEW
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 "SkBitmapProvider.h" 8 #include "SkBitmapProvider.h"
9 #include "SkImage_Base.h" 9 #include "SkImage_Base.h"
10 #include "SkPixelRef.h" 10 #include "SkPixelRef.h"
(...skipping 27 matching lines...) Expand all
38 if (!fBitmap.getColorTable()) { 38 if (!fBitmap.getColorTable()) {
39 return false; 39 return false;
40 } 40 }
41 } 41 }
42 } 42 }
43 return true; 43 return true;
44 } 44 }
45 45
46 SkImageInfo SkBitmapProvider::info() const { 46 SkImageInfo SkBitmapProvider::info() const {
47 if (fImage) { 47 if (fImage) {
48 SkAlphaType at = fImage->isOpaque() ? kOpaque_SkAlphaType : kPremul_SkAl phaType; 48 return as_IB(fImage)->onImageInfo();
49 return SkImageInfo::MakeN32(fImage->width(), fImage->height(), at);
50 } else { 49 } else {
51 return fBitmap.info(); 50 return fBitmap.info();
52 } 51 }
53 } 52 }
54 53
55 bool SkBitmapProvider::isVolatile() const { 54 bool SkBitmapProvider::isVolatile() const {
56 if (fImage) { 55 if (fImage) {
57 return false; // add flag to images? 56 return false; // add flag to images?
58 } else { 57 } else {
59 return fBitmap.isVolatile(); 58 return fBitmap.isVolatile();
(...skipping 17 matching lines...) Expand all
77 } 76 }
78 77
79 bool SkBitmapProvider::asBitmap(SkBitmap* bm) const { 78 bool SkBitmapProvider::asBitmap(SkBitmap* bm) const {
80 if (fImage) { 79 if (fImage) {
81 return as_IB(fImage)->getROPixels(bm, SkImage::kAllow_CachingHint); 80 return as_IB(fImage)->getROPixels(bm, SkImage::kAllow_CachingHint);
82 } else { 81 } else {
83 *bm = fBitmap; 82 *bm = fBitmap;
84 return true; 83 return true;
85 } 84 }
86 } 85 }
OLDNEW
« src/core/SkBitmap.cpp ('K') | « src/core/SkBitmap.cpp ('k') | src/core/SkImageInfo.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698