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

Side by Side Diff: gm/dftext.cpp

Issue 849103004: Make SkStream *not* ref counted. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Rebase, just in case. Created 5 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
« no previous file with comments | « gm/dcshader.cpp ('k') | include/core/SkImageDecoder.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 2011 Google Inc. 2 * Copyright 2011 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 #include "gm.h" 7 #include "gm.h"
8 #include "Resources.h" 8 #include "Resources.h"
9 #include "SkCanvas.h" 9 #include "SkCanvas.h"
10 #include "SkStream.h" 10 #include "SkStream.h"
11 #include "SkSurface.h" 11 #include "SkSurface.h"
12 #include "SkTypeface.h" 12 #include "SkTypeface.h"
13 13
14 class DFTextGM : public skiagm::GM { 14 class DFTextGM : public skiagm::GM {
15 public: 15 public:
16 DFTextGM() { 16 DFTextGM() {
17 this->setBGColor(0xFFFFFFFF); 17 this->setBGColor(0xFFFFFFFF);
18 fTypeface = NULL; 18 fTypeface = NULL;
19 } 19 }
20 20
21 virtual ~DFTextGM() { 21 virtual ~DFTextGM() {
22 SkSafeUnref(fTypeface); 22 SkSafeUnref(fTypeface);
23 } 23 }
24 24
25 protected: 25 protected:
26 void onOnceBeforeDraw() SK_OVERRIDE { 26 void onOnceBeforeDraw() SK_OVERRIDE {
27 SkString filename = GetResourcePath("/Funkster.ttf"); 27 SkString filename = GetResourcePath("/Funkster.ttf");
28 SkAutoTUnref<SkFILEStream> stream(new SkFILEStream(filename.c_str())); 28 SkAutoTDelete<SkFILEStream> stream(new SkFILEStream(filename.c_str()));
29 if (!stream->isValid()) { 29 if (!stream->isValid()) {
30 SkDebugf("Could not find Funkster.ttf, please set --resourcePath cor rectly.\n"); 30 SkDebugf("Could not find Funkster.ttf, please set --resourcePath cor rectly.\n");
31 return; 31 return;
32 } 32 }
33 33
34 fTypeface = SkTypeface::CreateFromStream(stream); 34 fTypeface = SkTypeface::CreateFromStream(stream.detach());
35 } 35 }
36 36
37 uint32_t onGetFlags() const SK_OVERRIDE { 37 uint32_t onGetFlags() const SK_OVERRIDE {
38 return kGPUOnly_Flag; 38 return kGPUOnly_Flag;
39 } 39 }
40 40
41 SkString onShortName() SK_OVERRIDE { 41 SkString onShortName() SK_OVERRIDE {
42 return SkString("dftext"); 42 return SkString("dftext");
43 } 43 }
44 44
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 #endif 217 #endif
218 } 218 }
219 219
220 private: 220 private:
221 SkTypeface* fTypeface; 221 SkTypeface* fTypeface;
222 222
223 typedef skiagm::GM INHERITED; 223 typedef skiagm::GM INHERITED;
224 }; 224 };
225 225
226 DEF_GM( return SkNEW(DFTextGM); ) 226 DEF_GM( return SkNEW(DFTextGM); )
OLDNEW
« no previous file with comments | « gm/dcshader.cpp ('k') | include/core/SkImageDecoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698