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

Side by Side Diff: src/image/SkSurface.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_Gpu.cpp ('k') | src/image/SkSurface_Gpu.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 "SkSurface_Base.h" 8 #include "SkSurface_Base.h"
9 #include "SkImagePriv.h" 9 #include "SkImagePriv.h"
10 #include "SkCanvas.h" 10 #include "SkCanvas.h"
11 11
12 SK_DEFINE_INST_COUNT(SkSurface)
13
14 /////////////////////////////////////////////////////////////////////////////// 12 ///////////////////////////////////////////////////////////////////////////////
15 13
16 SkSurface_Base::SkSurface_Base(int width, int height) : INHERITED(width, height) { 14 SkSurface_Base::SkSurface_Base(int width, int height) : INHERITED(width, height) {
17 fCachedCanvas = NULL; 15 fCachedCanvas = NULL;
18 fCachedImage = NULL; 16 fCachedImage = NULL;
19 } 17 }
20 18
21 SkSurface_Base::~SkSurface_Base() { 19 SkSurface_Base::~SkSurface_Base() {
22 // in case the canvas outsurvives us, we null the callback 20 // in case the canvas outsurvives us, we null the callback
23 if (fCachedCanvas) { 21 if (fCachedCanvas) {
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 } 100 }
103 101
104 SkSurface* SkSurface::newSurface(const SkImageInfo& info) { 102 SkSurface* SkSurface::newSurface(const SkImageInfo& info) {
105 return asSB(this)->onNewSurface(info); 103 return asSB(this)->onNewSurface(info);
106 } 104 }
107 105
108 void SkSurface::draw(SkCanvas* canvas, SkScalar x, SkScalar y, 106 void SkSurface::draw(SkCanvas* canvas, SkScalar x, SkScalar y,
109 const SkPaint* paint) { 107 const SkPaint* paint) {
110 return asSB(this)->onDraw(canvas, x, y, paint); 108 return asSB(this)->onDraw(canvas, x, y, paint);
111 } 109 }
OLDNEW
« no previous file with comments | « src/image/SkImage_Gpu.cpp ('k') | src/image/SkSurface_Gpu.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698