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

Side by Side Diff: src/utils/SkImageGeneratorUtils.cpp

Issue 1316123003: Style Change: SkNEW->new; SkDELETE->delete (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-26 (Wednesday) 15:59:00 EDT 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/utils/SkFrontBufferedStream.cpp ('k') | src/utils/SkNullCanvas.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 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 "SkImageGeneratorUtils.h" 8 #include "SkImageGeneratorUtils.h"
9 #include "SkBitmap.h" 9 #include "SkBitmap.h"
10 10
11 class GeneratorFromEmpty : public SkImageGenerator { 11 class GeneratorFromEmpty : public SkImageGenerator {
12 public: 12 public:
13 GeneratorFromEmpty(const SkImageInfo& info) : SkImageGenerator(info) {} 13 GeneratorFromEmpty(const SkImageInfo& info) : SkImageGenerator(info) {}
14 }; 14 };
15 15
16 SkImageGenerator* SkImageGeneratorUtils::NewEmpty(const SkImageInfo& info) { 16 SkImageGenerator* SkImageGeneratorUtils::NewEmpty(const SkImageInfo& info) {
17 return SkNEW_ARGS(GeneratorFromEmpty, (info)); 17 return new GeneratorFromEmpty(info);
18 } 18 }
19 19
20 //////////////////////////////////////////////////////////////////////////////// /////////////////// 20 //////////////////////////////////////////////////////////////////////////////// ///////////////////
21 21
22 class GeneratorFromBitmap : public SkImageGenerator { 22 class GeneratorFromBitmap : public SkImageGenerator {
23 public: 23 public:
24 GeneratorFromBitmap(const SkBitmap& bm) : SkImageGenerator(bm.info()), fBM(b m) { 24 GeneratorFromBitmap(const SkBitmap& bm) : SkImageGenerator(bm.info()), fBM(b m) {
25 if (!bm.isImmutable()) { 25 if (!bm.isImmutable()) {
26 bm.copyTo(&fBM); 26 bm.copyTo(&fBM);
27 } 27 }
28 } 28 }
29 29
30 protected: 30 protected:
31 bool onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, 31 bool onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes,
32 SkPMColor*, int*) override { 32 SkPMColor*, int*) override {
33 return fBM.readPixels(info, pixels, rowBytes, 0, 0); 33 return fBM.readPixels(info, pixels, rowBytes, 0, 0);
34 } 34 }
35 35
36 private: 36 private:
37 SkBitmap fBM; 37 SkBitmap fBM;
38 }; 38 };
39 39
40 SkImageGenerator* SkImageGeneratorUtils::NewFromBitmap(const SkBitmap& bm) { 40 SkImageGenerator* SkImageGeneratorUtils::NewFromBitmap(const SkBitmap& bm) {
41 return SkNEW_ARGS(GeneratorFromBitmap, (bm)); 41 return new GeneratorFromBitmap(bm);
42 } 42 }
43 43
44 //////////////////////////////////////////////////////////////////////////////// /////////////////// 44 //////////////////////////////////////////////////////////////////////////////// ///////////////////
45 45
46 #if SK_SUPPORT_GPU 46 #if SK_SUPPORT_GPU
47 47
48 #include "GrContext.h" 48 #include "GrContext.h"
49 #include "GrTexture.h" 49 #include "GrTexture.h"
50 #include "SkGr.h" 50 #include "SkGr.h"
51 51
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 if (ctx && tex) { 84 if (ctx && tex) {
85 const GrSurfaceDesc desc = tex->desc(); 85 const GrSurfaceDesc desc = tex->desc();
86 86
87 SkColorType ct; 87 SkColorType ct;
88 SkColorProfileType cpt; 88 SkColorProfileType cpt;
89 if (!GrPixelConfig2ColorAndProfileType(desc.fConfig, &ct, &cpt)) { 89 if (!GrPixelConfig2ColorAndProfileType(desc.fConfig, &ct, &cpt)) {
90 return nullptr; 90 return nullptr;
91 } 91 }
92 const SkAlphaType at = kPremul_SkAlphaType; // take isOpaque from caller ? 92 const SkAlphaType at = kPremul_SkAlphaType; // take isOpaque from caller ?
93 SkImageInfo info = SkImageInfo::Make(desc.fWidth, desc.fHeight, ct, at, cpt); 93 SkImageInfo info = SkImageInfo::Make(desc.fWidth, desc.fHeight, ct, at, cpt);
94 return SkNEW_ARGS(GeneratorFromTexture, (ctx, tex, info)); 94 return new GeneratorFromTexture(ctx, tex, info);
95 } 95 }
96 #endif 96 #endif
97 return nullptr; 97 return nullptr;
98 } 98 }
99 99
100 //////////////////////////////////////////////////////////////////////////////// /////////////////// 100 //////////////////////////////////////////////////////////////////////////////// ///////////////////
101 101
102 #include "SkImage.h" 102 #include "SkImage.h"
103 103
104 class GeneratorFromImage : public SkImageGenerator { 104 class GeneratorFromImage : public SkImageGenerator {
(...skipping 14 matching lines...) Expand all
119 119
120 private: 120 private:
121 SkAutoTUnref<const SkImage> fImage; 121 SkAutoTUnref<const SkImage> fImage;
122 }; 122 };
123 123
124 SkImageGenerator* SkImageGeneratorUtils::NewFromImage(const SkImage* image) { 124 SkImageGenerator* SkImageGeneratorUtils::NewFromImage(const SkImage* image) {
125 if (image) { 125 if (image) {
126 const SkColorType ct = kN32_SkColorType; 126 const SkColorType ct = kN32_SkColorType;
127 const SkAlphaType at = image->isOpaque() ? kOpaque_SkAlphaType : kPremul _SkAlphaType; 127 const SkAlphaType at = image->isOpaque() ? kOpaque_SkAlphaType : kPremul _SkAlphaType;
128 const SkImageInfo info = SkImageInfo::Make(image->width(), image->height (), ct, at); 128 const SkImageInfo info = SkImageInfo::Make(image->width(), image->height (), ct, at);
129 return SkNEW_ARGS(GeneratorFromImage, (image, info)); 129 return new GeneratorFromImage(image, info);
130 } 130 }
131 return nullptr; 131 return nullptr;
132 } 132 }
133 133
134 134
OLDNEW
« no previous file with comments | « src/utils/SkFrontBufferedStream.cpp ('k') | src/utils/SkNullCanvas.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698