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

Side by Side Diff: src/image/SkImage_Gpu.cpp

Issue 98703002: Fix compilation with SK_ENABLE_INST_COUNT=1 (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years 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 | « src/image/SkImage.cpp ('k') | src/image/SkSurface.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 2012 Google Inc. 2 * Copyright 2012 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 "SkImagePriv.h" 9 #include "SkImagePriv.h"
10 #include "SkBitmap.h" 10 #include "SkBitmap.h"
(...skipping 18 matching lines...) Expand all
29 } 29 }
30 30
31 GrTexture* getTexture() { return fBitmap.getTexture(); } 31 GrTexture* getTexture() { return fBitmap.getTexture(); }
32 32
33 private: 33 private:
34 SkBitmap fBitmap; 34 SkBitmap fBitmap;
35 35
36 typedef SkImage_Base INHERITED; 36 typedef SkImage_Base INHERITED;
37 }; 37 };
38 38
39 SK_DEFINE_INST_COUNT(SkImage_Gpu)
40
41 /////////////////////////////////////////////////////////////////////////////// 39 ///////////////////////////////////////////////////////////////////////////////
42 40
43 SkImage_Gpu::SkImage_Gpu(const SkBitmap& bitmap) 41 SkImage_Gpu::SkImage_Gpu(const SkBitmap& bitmap)
44 : INHERITED(bitmap.width(), bitmap.height()) 42 : INHERITED(bitmap.width(), bitmap.height())
45 , fBitmap(bitmap) { 43 , fBitmap(bitmap) {
46 SkASSERT(NULL != fBitmap.getTexture()); 44 SkASSERT(NULL != fBitmap.getTexture());
47 } 45 }
48 46
49 SkImage_Gpu::~SkImage_Gpu() { 47 SkImage_Gpu::~SkImage_Gpu() {
50 } 48 }
(...skipping 18 matching lines...) Expand all
69 if (NULL == bitmap.getTexture()) { 67 if (NULL == bitmap.getTexture()) {
70 return NULL; 68 return NULL;
71 } 69 }
72 70
73 return SkNEW_ARGS(SkImage_Gpu, (bitmap)); 71 return SkNEW_ARGS(SkImage_Gpu, (bitmap));
74 } 72 }
75 73
76 GrTexture* SkTextureImageGetTexture(SkImage* image) { 74 GrTexture* SkTextureImageGetTexture(SkImage* image) {
77 return ((SkImage_Gpu*)image)->getTexture(); 75 return ((SkImage_Gpu*)image)->getTexture();
78 } 76 }
OLDNEW
« no previous file with comments | « src/image/SkImage.cpp ('k') | src/image/SkSurface.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698