OLD | NEW |
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" |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
43 if (NULL != fCachedCanvas) { | 43 if (NULL != fCachedCanvas) { |
44 SkASSERT(fCachedCanvas->getSurfaceBase() == this || \ | 44 SkASSERT(fCachedCanvas->getSurfaceBase() == this || \ |
45 NULL == fCachedCanvas->getSurfaceBase()); | 45 NULL == fCachedCanvas->getSurfaceBase()); |
46 fCachedCanvas->setSurfaceBase(NULL); | 46 fCachedCanvas->setSurfaceBase(NULL); |
47 } | 47 } |
48 | 48 |
49 if (NULL != fCachedImage) { | 49 if (NULL != fCachedImage) { |
50 // the surface may need to fork its backend, if its sharing it with | 50 // the surface may need to fork its backend, if its sharing it with |
51 // the cached image. Note: we only call if there is an outstanding owner | 51 // the cached image. Note: we only call if there is an outstanding owner |
52 // on the image (besides us). | 52 // on the image (besides us). |
53 if (fCachedImage->getRefCnt() > 1) { | 53 if (!fCachedImage->unique()) { |
54 this->onCopyOnWrite(mode); | 54 this->onCopyOnWrite(mode); |
55 } | 55 } |
56 | 56 |
57 // regardless of copy-on-write, we must drop our cached image now, so | 57 // regardless of copy-on-write, we must drop our cached image now, so |
58 // that the next request will get our new contents. | 58 // that the next request will get our new contents. |
59 fCachedImage->unref(); | 59 fCachedImage->unref(); |
60 fCachedImage = NULL; | 60 fCachedImage = NULL; |
61 } | 61 } |
62 } | 62 } |
63 | 63 |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
102 } | 102 } |
103 | 103 |
104 SkSurface* SkSurface::newSurface(const SkImage::Info& info) { | 104 SkSurface* SkSurface::newSurface(const SkImage::Info& info) { |
105 return asSB(this)->onNewSurface(info); | 105 return asSB(this)->onNewSurface(info); |
106 } | 106 } |
107 | 107 |
108 void SkSurface::draw(SkCanvas* canvas, SkScalar x, SkScalar y, | 108 void SkSurface::draw(SkCanvas* canvas, SkScalar x, SkScalar y, |
109 const SkPaint* paint) { | 109 const SkPaint* paint) { |
110 return asSB(this)->onDraw(canvas, x, y, paint); | 110 return asSB(this)->onDraw(canvas, x, y, paint); |
111 } | 111 } |
OLD | NEW |