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_Generator.cpp

Issue 1903483003: Add onImageInfo call to SkImage_Base. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Remove ImageInfo changes. 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
« no previous file with comments | « src/image/SkImage_Base.h ('k') | src/image/SkImage_Gpu.h » ('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 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 "SkBitmap.h" 9 #include "SkBitmap.h"
10 #include "SkCanvas.h" 10 #include "SkCanvas.h"
11 #include "SkData.h" 11 #include "SkData.h"
12 #include "SkImageCacherator.h" 12 #include "SkImageCacherator.h"
13 #include "SkImagePriv.h" 13 #include "SkImagePriv.h"
14 #include "SkPixelRef.h" 14 #include "SkPixelRef.h"
15 #include "SkSurface.h" 15 #include "SkSurface.h"
16 16
17 class SkImage_Generator : public SkImage_Base { 17 class SkImage_Generator : public SkImage_Base {
18 public: 18 public:
19 SkImage_Generator(SkImageCacherator* cache) 19 SkImage_Generator(SkImageCacherator* cache)
20 : INHERITED(cache->info().width(), cache->info().height(), cache->unique ID()) 20 : INHERITED(cache->info().width(), cache->info().height(), cache->unique ID())
21 , fCache(cache) // take ownership 21 , fCache(cache) // take ownership
22 {} 22 {}
23 23
24 virtual SkImageInfo onImageInfo() const override {
25 return fCache->info();
26 }
27
24 bool onReadPixels(const SkImageInfo&, void*, size_t, int srcX, int srcY, Cac hingHint) const override; 28 bool onReadPixels(const SkImageInfo&, void*, size_t, int srcX, int srcY, Cac hingHint) const override;
25 SkImageCacherator* peekCacherator() const override { return fCache; } 29 SkImageCacherator* peekCacherator() const override { return fCache; }
26 SkData* onRefEncoded(GrContext*) const override; 30 SkData* onRefEncoded(GrContext*) const override;
27 bool isOpaque() const override { return fCache->info().isOpaque(); } 31 bool isOpaque() const override { return fCache->info().isOpaque(); }
28 sk_sp<SkImage> onMakeSubset(const SkIRect&) const override; 32 sk_sp<SkImage> onMakeSubset(const SkIRect&) const override;
29 bool getROPixels(SkBitmap*, CachingHint) const override; 33 bool getROPixels(SkBitmap*, CachingHint) const override;
30 GrTexture* asTextureRef(GrContext*, const GrTextureParams&) const override; 34 GrTexture* asTextureRef(GrContext*, const GrTextureParams&) const override;
31 bool onIsLazyGenerated() const override { return true; } 35 bool onIsLazyGenerated() const override { return true; }
32 36
33 private: 37 private:
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 sk_sp<SkImage> SkImage::MakeFromGenerator(SkImageGenerator* generator, const SkI Rect* subset) { 96 sk_sp<SkImage> SkImage::MakeFromGenerator(SkImageGenerator* generator, const SkI Rect* subset) {
93 if (!generator) { 97 if (!generator) {
94 return nullptr; 98 return nullptr;
95 } 99 }
96 SkImageCacherator* cache = SkImageCacherator::NewFromGenerator(generator, su bset); 100 SkImageCacherator* cache = SkImageCacherator::NewFromGenerator(generator, su bset);
97 if (!cache) { 101 if (!cache) {
98 return nullptr; 102 return nullptr;
99 } 103 }
100 return sk_make_sp<SkImage_Generator>(cache); 104 return sk_make_sp<SkImage_Generator>(cache);
101 } 105 }
OLDNEW
« no previous file with comments | « src/image/SkImage_Base.h ('k') | src/image/SkImage_Gpu.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698