| 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 "../src/image/SkImagePriv.h" | 8 #include "../src/image/SkImagePriv.h" |
| 9 #include "../src/image/SkSurface_Base.h" | 9 #include "../src/image/SkSurface_Base.h" |
| 10 #include "SkBitmap.h" | 10 #include "SkBitmap.h" |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 | 57 |
| 58 SkCanvas* onNewCanvas() override { | 58 SkCanvas* onNewCanvas() override { |
| 59 return SkNEW_ARGS(SkCanvas, (fBitmap)); | 59 return SkNEW_ARGS(SkCanvas, (fBitmap)); |
| 60 } | 60 } |
| 61 | 61 |
| 62 SkSurface* onNewSurface(const SkImageInfo&) override { | 62 SkSurface* onNewSurface(const SkImageInfo&) override { |
| 63 return NULL; | 63 return NULL; |
| 64 } | 64 } |
| 65 | 65 |
| 66 SkImage* onNewImageSnapshot(Budgeted) override { | 66 SkImage* onNewImageSnapshot(Budgeted) override { |
| 67 return SkNewImageFromRasterBitmap(fBitmap, true, &this->props(), | 67 return SkNewImageFromRasterBitmap(fBitmap, &this->props(), kUnlocked_Sha
redPixelRefMode); |
| 68 kUnlocked_SharedPixelRefMode); | |
| 69 } | 68 } |
| 70 | 69 |
| 71 void onCopyOnWrite(ContentChangeMode mode) override { | 70 void onCopyOnWrite(ContentChangeMode mode) override { |
| 72 if (mode == SkSurface::kDiscard_ContentChangeMode) { | 71 if (mode == SkSurface::kDiscard_ContentChangeMode) { |
| 73 fCOWDiscardCount++; | 72 fCOWDiscardCount++; |
| 74 } else { | 73 } else { |
| 75 fCOWRetainCount++; | 74 fCOWRetainCount++; |
| 76 } | 75 } |
| 77 } | 76 } |
| 78 | 77 |
| (...skipping 861 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 940 TestDeferredCanvasSurface(reporter, NULL); | 939 TestDeferredCanvasSurface(reporter, NULL); |
| 941 TestDeferredCanvasSetSurface(reporter, NULL); | 940 TestDeferredCanvasSetSurface(reporter, NULL); |
| 942 } | 941 } |
| 943 | 942 |
| 944 DEF_GPUTEST(DeferredCanvas_GPU, reporter, factory) { | 943 DEF_GPUTEST(DeferredCanvas_GPU, reporter, factory) { |
| 945 if (factory != NULL) { | 944 if (factory != NULL) { |
| 946 TestDeferredCanvasSurface(reporter, factory); | 945 TestDeferredCanvasSurface(reporter, factory); |
| 947 TestDeferredCanvasSetSurface(reporter, factory); | 946 TestDeferredCanvasSetSurface(reporter, factory); |
| 948 } | 947 } |
| 949 } | 948 } |
| OLD | NEW |