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

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

Issue 173893002: use colortype instead of config (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 6 years, 10 months 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/device/xps/SkXPSDevice.cpp ('k') | src/pdf/SkPDFDevice.cpp » ('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 #include "SkImageGenerator.h" 10 #include "SkImageGenerator.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 bool SkInstallDiscardablePixelRef(SkImageGenerator* generator, 80 bool SkInstallDiscardablePixelRef(SkImageGenerator* generator,
81 SkBitmap* dst, 81 SkBitmap* dst,
82 SkDiscardableMemory::Factory* factory) { 82 SkDiscardableMemory::Factory* factory) {
83 SkImageInfo info; 83 SkImageInfo info;
84 SkAutoTDelete<SkImageGenerator> autoGenerator(generator); 84 SkAutoTDelete<SkImageGenerator> autoGenerator(generator);
85 if ((NULL == autoGenerator.get()) 85 if ((NULL == autoGenerator.get())
86 || (!autoGenerator->getInfo(&info)) 86 || (!autoGenerator->getInfo(&info))
87 || (!dst->setConfig(info, 0))) { 87 || (!dst->setConfig(info, 0))) {
88 return false; 88 return false;
89 } 89 }
90 SkASSERT(dst->config() != SkBitmap::kNo_Config); 90 SkASSERT(dst->colorType() != kUnknown_SkColorType);
91 if (dst->empty()) { // Use a normal pixelref. 91 if (dst->empty()) { // Use a normal pixelref.
92 return dst->allocPixels(); 92 return dst->allocPixels();
93 } 93 }
94 SkAutoTUnref<SkDiscardablePixelRef> ref( 94 SkAutoTUnref<SkDiscardablePixelRef> ref(
95 SkNEW_ARGS(SkDiscardablePixelRef, 95 SkNEW_ARGS(SkDiscardablePixelRef,
96 (info, autoGenerator.detach(), dst->rowBytes(), factory))); 96 (info, autoGenerator.detach(), dst->rowBytes(), factory)));
97 dst->setPixelRef(ref); 97 dst->setPixelRef(ref);
98 return true; 98 return true;
99 } 99 }
OLDNEW
« no previous file with comments | « src/device/xps/SkXPSDevice.cpp ('k') | src/pdf/SkPDFDevice.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698