src/lazy/SkDiscardablePixelRef.cpp - Issue 132643007: Revert "Revert of https://codereview.chromium.org/129423002/"

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 132643007: Revert "Revert of https://codereview.chromium.org/129423002/" (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: Created 6 years, 11 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:

« no previous file with comments | « src/lazy/SkCachingPixelRef.cpp ('k') | tests/MallocPixelRefTest.cpp » ('j') | no next file with comments »

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 76 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
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->config() != SkBitmap::kNo_Config);

91 if (dst->empty()) { // Use a normal pixelref.	91 if (dst->empty()) { // Use a normal pixelref.

92 return dst->allocPixels(NULL, NULL);	92 return dst->allocPixels(NULL, NULL);

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->installPixelRef(ref);

98 return true;	98 return true;

99 }	99 }

OLD	NEW