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

Side by Side Diff: samplecode/SamplePicture.cpp

Issue 93703004: Change SkDecodingImageGenerator API (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: rebased Created 6 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « include/core/SkImageGenerator.h ('k') | src/image/SkImagePriv.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 /* 2 /*
3 * Copyright 2011 Google Inc. 3 * Copyright 2011 Google Inc.
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 #include "SampleCode.h" 8 #include "SampleCode.h"
9 #include "SkData.h" 9 #include "SkData.h"
10 #include "SkDecodingImageGenerator.h" 10 #include "SkDecodingImageGenerator.h"
(...skipping 22 matching lines...) Expand all
33 #include "gm.h" 33 #include "gm.h"
34 34
35 /////////////////////////////////////////////////////////////////////////////// 35 ///////////////////////////////////////////////////////////////////////////////
36 36
37 static SkBitmap load_bitmap() { 37 static SkBitmap load_bitmap() {
38 SkBitmap bm; 38 SkBitmap bm;
39 SkString directory = skiagm::GM::GetResourcePath(); 39 SkString directory = skiagm::GM::GetResourcePath();
40 SkString path = SkOSPath::SkPathJoin(directory.c_str(), "mandrill_512.png"); 40 SkString path = SkOSPath::SkPathJoin(directory.c_str(), "mandrill_512.png");
41 SkAutoDataUnref data(SkData::NewFromFileName(path.c_str())); 41 SkAutoDataUnref data(SkData::NewFromFileName(path.c_str()));
42 if (data.get() != NULL) { 42 if (data.get() != NULL) {
43 SkDecodingImageGenerator::Install(data.get(), &bm); 43 SkInstallDiscardablePixelRef(SkDecodingImageGenerator::Create(
44 data, SkDecodingImageGenerator::Options()), &bm, NULL);
44 } 45 }
45 return bm; 46 return bm;
46 } 47 }
47 48
48 static void drawCircle(SkCanvas* canvas, int r, SkColor color) { 49 static void drawCircle(SkCanvas* canvas, int r, SkColor color) {
49 SkPaint paint; 50 SkPaint paint;
50 paint.setAntiAlias(true); 51 paint.setAntiAlias(true);
51 paint.setColor(color); 52 paint.setColor(color);
52 53
53 canvas->drawCircle(SkIntToScalar(r), SkIntToScalar(r), SkIntToScalar(r), 54 canvas->drawCircle(SkIntToScalar(r), SkIntToScalar(r), SkIntToScalar(r),
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 SkPicture* fPicture; 189 SkPicture* fPicture;
189 SkPicture* fSubPicture; 190 SkPicture* fSubPicture;
190 191
191 typedef SampleView INHERITED; 192 typedef SampleView INHERITED;
192 }; 193 };
193 194
194 ////////////////////////////////////////////////////////////////////////////// 195 //////////////////////////////////////////////////////////////////////////////
195 196
196 static SkView* MyFactory() { return new PictureView; } 197 static SkView* MyFactory() { return new PictureView; }
197 static SkViewRegister reg(MyFactory); 198 static SkViewRegister reg(MyFactory);
OLDNEW
« no previous file with comments | « include/core/SkImageGenerator.h ('k') | src/image/SkImagePriv.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698