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

Side by Side Diff: src/core/SkBitmapDevice.cpp

Issue 510423005: make allocPixels throw on failure (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 6 years, 3 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
« no previous file with comments | « src/core/SkBitmap.cpp ('k') | src/core/SkCanvas.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 "SkBitmapDevice.h" 8 #include "SkBitmapDevice.h"
9 #include "SkConfig8888.h" 9 #include "SkConfig8888.h"
10 #include "SkDraw.h" 10 #include "SkDraw.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 return NULL; 75 return NULL;
76 } 76 }
77 77
78 SkBitmap bitmap; 78 SkBitmap bitmap;
79 79
80 if (kUnknown_SkColorType == info.colorType()) { 80 if (kUnknown_SkColorType == info.colorType()) {
81 if (!bitmap.setInfo(info)) { 81 if (!bitmap.setInfo(info)) {
82 return NULL; 82 return NULL;
83 } 83 }
84 } else { 84 } else {
85 if (!bitmap.allocPixels(info)) { 85 if (!bitmap.tryAllocPixels(info)) {
86 return NULL; 86 return NULL;
87 } 87 }
88 if (!bitmap.info().isOpaque()) { 88 if (!bitmap.info().isOpaque()) {
89 bitmap.eraseColor(SK_ColorTRANSPARENT); 89 bitmap.eraseColor(SK_ColorTRANSPARENT);
90 } 90 }
91 } 91 }
92 92
93 if (props) { 93 if (props) {
94 return SkNEW_ARGS(SkBitmapDevice, (bitmap, *props)); 94 return SkNEW_ARGS(SkBitmapDevice, (bitmap, *props));
95 } else { 95 } else {
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
388 paint.getStyle() != SkPaint::kFill_Style || 388 paint.getStyle() != SkPaint::kFill_Style ||
389 !SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrcOver_Mode)) { 389 !SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrcOver_Mode)) {
390 // turn off lcd 390 // turn off lcd
391 flags->fFlags = paint.getFlags() & ~SkPaint::kLCDRenderText_Flag; 391 flags->fFlags = paint.getFlags() & ~SkPaint::kLCDRenderText_Flag;
392 flags->fHinting = paint.getHinting(); 392 flags->fHinting = paint.getHinting();
393 return true; 393 return true;
394 } 394 }
395 // we're cool with the paint as is 395 // we're cool with the paint as is
396 return false; 396 return false;
397 } 397 }
OLDNEW
« no previous file with comments | « src/core/SkBitmap.cpp ('k') | src/core/SkCanvas.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698