OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright 2013 Google Inc. | 2 * Copyright 2013 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 "SkDiscardablePixelRef.h" | 8 #include "SkDiscardablePixelRef.h" |
9 #include "SkDiscardableMemory.h" | 9 #include "SkDiscardableMemory.h" |
10 #include "SkImageGenerator.h" | 10 #include "SkImageGenerator.h" |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
53 if (fDMFactory != NULL) { | 53 if (fDMFactory != NULL) { |
54 fDiscardableMemory = fDMFactory->create(size); | 54 fDiscardableMemory = fDMFactory->create(size); |
55 } else { | 55 } else { |
56 fDiscardableMemory = SkDiscardableMemory::Create(size); | 56 fDiscardableMemory = SkDiscardableMemory::Create(size); |
57 } | 57 } |
58 if (NULL == fDiscardableMemory) { | 58 if (NULL == fDiscardableMemory) { |
59 return false; // Memory allocation failed. | 59 return false; // Memory allocation failed. |
60 } | 60 } |
61 | 61 |
62 void* pixels = fDiscardableMemory->data(); | 62 void* pixels = fDiscardableMemory->data(); |
63 if (!fGenerator->getPixels(this->info(), pixels, fRowBytes)) { | 63 const SkImageInfo& info = this->info(); |
64 SkPMColor colors[256]; | |
65 int colorCount = 0; | |
66 | |
67 if (!fGenerator->getPixels(info, pixels, fRowBytes, colors, &colorCount)) { | |
64 fDiscardableMemory->unlock(); | 68 fDiscardableMemory->unlock(); |
65 SkDELETE(fDiscardableMemory); | 69 SkDELETE(fDiscardableMemory); |
66 fDiscardableMemory = NULL; | 70 fDiscardableMemory = NULL; |
67 return false; | 71 return false; |
68 } | 72 } |
69 | 73 |
74 if (colorCount > 0) { | |
75 fCTable.reset(SkNEW_ARGS(SkColorTable, (colors, colorCount))); | |
76 } else { | |
77 fCTable.reset(NULL); | |
78 } | |
79 | |
70 rec->fPixels = pixels; | 80 rec->fPixels = pixels; |
71 rec->fColorTable = NULL; | 81 rec->fColorTable = fCTable.get(); |
scroggo
2014/05/28 15:01:37
This version does not purge the color table on mem
reed1
2014/05/28 15:48:02
Agreed, I don't know how to ram the colortable int
| |
72 rec->fRowBytes = fRowBytes; | 82 rec->fRowBytes = fRowBytes; |
73 return true; | 83 return true; |
74 } | 84 } |
75 | 85 |
76 void SkDiscardablePixelRef::onUnlockPixels() { | 86 void SkDiscardablePixelRef::onUnlockPixels() { |
77 fDiscardableMemory->unlock(); | 87 fDiscardableMemory->unlock(); |
78 } | 88 } |
79 | 89 |
80 bool SkInstallDiscardablePixelRef(SkImageGenerator* generator, SkBitmap* dst, | 90 bool SkInstallDiscardablePixelRef(SkImageGenerator* generator, SkBitmap* dst, |
81 SkDiscardableMemory::Factory* factory) { | 91 SkDiscardableMemory::Factory* factory) { |
(...skipping 12 matching lines...) Expand all Loading... | |
94 SkNEW_ARGS(SkDiscardablePixelRef, | 104 SkNEW_ARGS(SkDiscardablePixelRef, |
95 (info, autoGenerator.detach(), dst->rowBytes(), factory))); | 105 (info, autoGenerator.detach(), dst->rowBytes(), factory))); |
96 dst->setPixelRef(ref); | 106 dst->setPixelRef(ref); |
97 return true; | 107 return true; |
98 } | 108 } |
99 | 109 |
100 // This is the public API | 110 // This is the public API |
101 bool SkInstallDiscardablePixelRef(SkImageGenerator* generator, SkBitmap* dst) { | 111 bool SkInstallDiscardablePixelRef(SkImageGenerator* generator, SkBitmap* dst) { |
102 return SkInstallDiscardablePixelRef(generator, dst, NULL); | 112 return SkInstallDiscardablePixelRef(generator, dst, NULL); |
103 } | 113 } |
OLD | NEW |