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

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: rebase one last time 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
« no previous file with comments | « src/lazy/SkDiscardablePixelRef.h ('k') | src/lazy/SkLazyPixelRef.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
23 // The SkImageGenerator contract requires fGenerator to always 25 // The SkImageGenerator contract requires fGenerator to always
24 // decode the same image on each call to getPixels(). 26 // decode the same image on each call to getPixels().
25 this->setImmutable(); 27 this->setImmutable();
28 SkSafeRef(fDMFactory);
26 } 29 }
27 30
28 SkDiscardablePixelRef::~SkDiscardablePixelRef() { 31 SkDiscardablePixelRef::~SkDiscardablePixelRef() {
32 SkDELETE(fDiscardableMemory);
33 SkSafeUnref(fDMFactory);
29 SkDELETE(fGenerator); 34 SkDELETE(fGenerator);
30 } 35 }
31 36
32 void* SkDiscardablePixelRef::onLockPixels(SkColorTable**) { 37 void* SkDiscardablePixelRef::onLockPixels(SkColorTable**) {
33 if (fDiscardableMemory != NULL) { 38 if (fDiscardableMemory != NULL) {
34 if (fDiscardableMemory->lock()) { 39 if (fDiscardableMemory->lock()) {
35 return fDiscardableMemory->data(); 40 return fDiscardableMemory->data();
36 } 41 }
42 SkDELETE(fDiscardableMemory);
37 fDiscardableMemory = NULL; 43 fDiscardableMemory = NULL;
38 } 44 }
39 fDiscardableMemory = SkDiscardableMemory::Create(fSize); 45 if (fDMFactory != NULL) {
46 fDiscardableMemory = fDMFactory->create(fSize);
47 } else {
48 fDiscardableMemory = SkDiscardableMemory::Create(fSize);
49 }
40 if (NULL == fDiscardableMemory) { 50 if (NULL == fDiscardableMemory) {
41 return NULL; // Memory allocation failed. 51 return NULL; // Memory allocation failed.
42 } 52 }
43 void* pixels = fDiscardableMemory->data(); 53 void* pixels = fDiscardableMemory->data();
44 if (!fGenerator->getPixels(fInfo, pixels, fRowBytes)) { 54 if (!fGenerator->getPixels(fInfo, pixels, fRowBytes)) {
45 return NULL; // TODO(halcanary) Find out correct thing to do. 55 return NULL; // TODO(halcanary) Find out correct thing to do.
46 } 56 }
47 return pixels; 57 return pixels;
48 } 58 }
49 void SkDiscardablePixelRef::onUnlockPixels() { 59 void SkDiscardablePixelRef::onUnlockPixels() {
50 if (fDiscardableMemory != NULL) { 60 if (fDiscardableMemory != NULL) {
51 fDiscardableMemory->unlock(); 61 fDiscardableMemory->unlock();
52 } 62 }
53 } 63 }
54 64
55 bool SkDiscardablePixelRef::Install(SkImageGenerator* generator, 65 bool SkDiscardablePixelRef::Install(SkImageGenerator* generator,
56 SkBitmap* dst) { 66 SkBitmap* dst,
67 SkDiscardableMemory::Factory* factory) {
57 SkImageInfo info; 68 SkImageInfo info;
58 SkASSERT(generator != NULL); 69 SkASSERT(generator != NULL);
59 if ((NULL == generator) 70 if ((NULL == generator)
60 || (!generator->getInfo(&info)) 71 || (!generator->getInfo(&info))
61 || (!dst->setConfig(info, 0))) { 72 || (!dst->setConfig(info, 0))
73 || (0 == dst->getSize())) { // dst->getSize=0 Probably a bad config
62 SkDELETE(generator); 74 SkDELETE(generator);
63 return false; 75 return false;
64 } 76 }
65 SkAutoTUnref<SkDiscardablePixelRef> ref(SkNEW_ARGS(SkDiscardablePixelRef, 77 SkAutoTUnref<SkDiscardablePixelRef> ref(SkNEW_ARGS(SkDiscardablePixelRef,
66 (generator, info, 78 (generator, info,
67 dst->getSize(), 79 dst->getSize(),
68 dst->rowBytes()))); 80 dst->rowBytes(),
81 factory)));
69 dst->setPixelRef(ref); 82 dst->setPixelRef(ref);
70 return true; 83 return true;
71 } 84 }
OLDNEW
« no previous file with comments | « src/lazy/SkDiscardablePixelRef.h ('k') | src/lazy/SkLazyPixelRef.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698