| 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 "SkCanvas.h" | 9 #include "SkCanvas.h" |
| 10 #include "SkImagePriv.h" | 10 #include "SkImagePriv.h" |
| 11 #include "SkPicture.h" | 11 #include "SkPicture.h" |
| 12 | 12 |
| 13 /** | 13 /** |
| 14 * What does it mean to ask for more than one canvas from a picture? | 14 * What does it mean to ask for more than one canvas from a picture? |
| 15 * How do we return an Image and then "continue" recording? | 15 * How do we return an Image and then "continue" recording? |
| 16 */ | 16 */ |
| 17 class SkSurface_Picture : public SkSurface_Base { | 17 class SkSurface_Picture : public SkSurface_Base { |
| 18 public: | 18 public: |
| 19 SkSurface_Picture(int width, int height); | 19 SkSurface_Picture(int width, int height); |
| 20 virtual ~SkSurface_Picture(); | 20 virtual ~SkSurface_Picture(); |
| 21 | 21 |
| 22 virtual SkCanvas* onNewCanvas() SK_OVERRIDE; | 22 virtual SkCanvas* onNewCanvas() SK_OVERRIDE; |
| 23 virtual SkSurface* onNewSurface(const SkImageInfo&) SK_OVERRIDE; | 23 virtual SkSurface* onNewSurface(const SkImageInfo&) SK_OVERRIDE; |
| 24 virtual SkImage* onNewImageSnapshot() SK_OVERRIDE; | 24 virtual SkImage* onNewImageSnapshot() SK_OVERRIDE; |
| 25 virtual void onDraw(SkCanvas*, SkScalar x, SkScalar y, | 25 virtual void onDraw(SkCanvas*, SkScalar x, SkScalar y, |
| 26 const SkPaint*) SK_OVERRIDE; | 26 const SkPaint*) SK_OVERRIDE; |
| 27 virtual void onCopyOnWrite(ContentChangeMode) SK_OVERRIDE; | 27 virtual void onCopyOnWrite(ContentChangeMode) SK_OVERRIDE; |
| 28 virtual void onDiscard() SK_OVERRIDE; |
| 28 | 29 |
| 29 private: | 30 private: |
| 30 SkPicture* fPicture; | 31 SkPicture* fPicture; |
| 31 | 32 |
| 32 typedef SkSurface_Base INHERITED; | 33 typedef SkSurface_Base INHERITED; |
| 33 }; | 34 }; |
| 34 | 35 |
| 35 /////////////////////////////////////////////////////////////////////////////// | 36 /////////////////////////////////////////////////////////////////////////////// |
| 36 | 37 |
| 37 SkSurface_Picture::SkSurface_Picture(int width, int height) : INHERITED(width, h
eight) { | 38 SkSurface_Picture::SkSurface_Picture(int width, int height) : INHERITED(width, h
eight) { |
| (...skipping 30 matching lines...) Expand all Loading... |
| 68 } | 69 } |
| 69 | 70 |
| 70 void SkSurface_Picture::onDraw(SkCanvas* canvas, SkScalar x, SkScalar y, | 71 void SkSurface_Picture::onDraw(SkCanvas* canvas, SkScalar x, SkScalar y, |
| 71 const SkPaint* paint) { | 72 const SkPaint* paint) { |
| 72 if (!fPicture) { | 73 if (!fPicture) { |
| 73 return; | 74 return; |
| 74 } | 75 } |
| 75 SkImagePrivDrawPicture(canvas, fPicture, x, y, paint); | 76 SkImagePrivDrawPicture(canvas, fPicture, x, y, paint); |
| 76 } | 77 } |
| 77 | 78 |
| 78 void SkSurface_Picture::onCopyOnWrite(ContentChangeMode /*mode*/) { | 79 void SkSurface_Picture::onCopyOnWrite(ContentChangeMode mode) { |
| 79 // We always spawn a copy of the recording picture when we | 80 // We always spawn a copy of the recording picture when we |
| 80 // are asked for a snapshot, so we never need to do anything here. | 81 // are asked for a snapshot, so we never need to do anything here. |
| 82 if (kDiscard_ContentChangeMode == mode) { |
| 83 this->SkSurface_Picture::onDiscard(); |
| 84 } |
| 85 } |
| 86 |
| 87 void SkSurface_Picture::onDiscard() { |
| 88 if (NULL != fPicture) { |
| 89 fPicture->beginRecording(this->width(), this->height()); |
| 90 } |
| 81 } | 91 } |
| 82 | 92 |
| 83 /////////////////////////////////////////////////////////////////////////////// | 93 /////////////////////////////////////////////////////////////////////////////// |
| 84 | 94 |
| 85 | 95 |
| 86 SkSurface* SkSurface::NewPicture(int width, int height) { | 96 SkSurface* SkSurface::NewPicture(int width, int height) { |
| 87 if ((width | height) < 0) { | 97 if ((width | height) < 0) { |
| 88 return NULL; | 98 return NULL; |
| 89 } | 99 } |
| 90 | 100 |
| 91 return SkNEW_ARGS(SkSurface_Picture, (width, height)); | 101 return SkNEW_ARGS(SkSurface_Picture, (width, height)); |
| 92 } | 102 } |
| OLD | NEW |