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

Side by Side Diff: src/lazy/SkDiscardablePixelRef.cpp

Issue 103033002: Big Cleanup: SkBitmapFactory, SkLazyPixelRef, SkImageCache (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
OLDNEW
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 10
11 SkDiscardablePixelRef::SkDiscardablePixelRef(SkImageGenerator* generator, 11 SkDiscardablePixelRef::SkDiscardablePixelRef(SkImageGenerator* generator,
12 const SkImageInfo& info, 12 const SkImageInfo& info,
13 size_t size, 13 size_t size,
14 size_t rowBytes) 14 size_t rowBytes,
15 SkDiscardableMemory::Factory* fact)
15 : fGenerator(generator) 16 : fGenerator(generator)
17 , fDMFactory(fact)
16 , fInfo(info) 18 , fInfo(info)
17 , fSize(size) 19 , fSize(size)
18 , fRowBytes(rowBytes) 20 , fRowBytes(rowBytes)
19 , fDiscardableMemory(NULL) { 21 , fDiscardableMemory(NULL) {
20 SkASSERT(fGenerator != NULL); 22 SkASSERT(fGenerator != NULL);
21 SkASSERT(fSize > 0); 23 SkASSERT(fSize > 0);
22 SkASSERT(fRowBytes > 0); 24 SkASSERT(fRowBytes > 0);
25 SkSafeRef(fDMFactory);
23 } 26 }
24 27
25 SkDiscardablePixelRef::~SkDiscardablePixelRef() { 28 SkDiscardablePixelRef::~SkDiscardablePixelRef() {
29 SkSafeUnref(fDMFactory);
26 SkDELETE(fGenerator); 30 SkDELETE(fGenerator);
27 } 31 }
28 32
29 void* SkDiscardablePixelRef::onLockPixels(SkColorTable**) { 33 void* SkDiscardablePixelRef::onLockPixels(SkColorTable**) {
30 if (fDiscardableMemory != NULL) { 34 if (fDiscardableMemory != NULL) {
31 if (fDiscardableMemory->lock()) { 35 if (fDiscardableMemory->lock()) {
32 return fDiscardableMemory->data(); 36 return fDiscardableMemory->data();
33 } 37 }
34 fDiscardableMemory = NULL; 38 fDiscardableMemory = NULL;
35 } 39 }
36 fDiscardableMemory = SkDiscardableMemory::Create(fSize); 40 if (fDMFactory != NULL) {
41 fDiscardableMemory = fDMFactory->create(fSize);
42 } else {
43 fDiscardableMemory = SkDiscardableMemory::Create(fSize);
44 }
37 if (NULL == fDiscardableMemory) { 45 if (NULL == fDiscardableMemory) {
38 return NULL; // Memory allocation failed. 46 return NULL; // Memory allocation failed.
39 } 47 }
40 void* pixels = fDiscardableMemory->data(); 48 void* pixels = fDiscardableMemory->data();
41 if (!fGenerator->getPixels(fInfo, pixels, fRowBytes)) { 49 if (!fGenerator->getPixels(fInfo, pixels, fRowBytes)) {
42 return NULL; // TODO(halcanary) Find out correct thing to do. 50 return NULL; // TODO(halcanary) Find out correct thing to do.
43 } 51 }
44 return pixels; 52 return pixels;
45 } 53 }
46 void SkDiscardablePixelRef::onUnlockPixels() { 54 void SkDiscardablePixelRef::onUnlockPixels() {
47 if (fDiscardableMemory != NULL) { 55 if (fDiscardableMemory != NULL) {
48 fDiscardableMemory->unlock(); 56 fDiscardableMemory->unlock();
49 } 57 }
50 } 58 }
51 59
52 bool SkDiscardablePixelRef::Install(SkImageGenerator* generator, 60 bool SkDiscardablePixelRef::Install(SkImageGenerator* generator,
53 SkBitmap* dst) { 61 SkBitmap* dst,
62 SkDiscardableMemory::Factory* factory) {
54 SkImageInfo info; 63 SkImageInfo info;
55 SkASSERT(generator != NULL); 64 SkASSERT(generator != NULL);
56 if ((NULL == generator) 65 if ((NULL == generator)
57 || (!generator->getInfo(&info)) 66 || (!generator->getInfo(&info))
58 || (!dst->setConfig(info, 0))) { 67 || (!dst->setConfig(info, 0))
68 || (0 == dst->getSize())) { // dst->getSize=0 Probably a bad config
59 SkDELETE(generator); 69 SkDELETE(generator);
60 return false; 70 return false;
61 } 71 }
62 SkAutoTUnref<SkDiscardablePixelRef> ref(SkNEW_ARGS(SkDiscardablePixelRef, 72 SkAutoTUnref<SkDiscardablePixelRef> ref(SkNEW_ARGS(SkDiscardablePixelRef,
63 (generator, info, 73 (generator, info,
64 dst->getSize(), 74 dst->getSize(),
65 dst->rowBytes()))); 75 dst->rowBytes(),
76 factory)));
66 dst->setPixelRef(ref); 77 dst->setPixelRef(ref);
67 return true; 78 return true;
68 } 79 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698