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

Side by Side Diff: src/effects/SkTileImageFilter.cpp

Issue 92793002: Fixed bad bitmap size crashes (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Changed getSize name to getAllocatedSizeInBytes 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 "SkTileImageFilter.h" 8 #include "SkTileImageFilter.h"
9 #include "SkBitmap.h" 9 #include "SkBitmap.h"
10 #include "SkCanvas.h" 10 #include "SkCanvas.h"
(...skipping 20 matching lines...) Expand all
31 } 31 }
32 32
33 SkIRect srcRect; 33 SkIRect srcRect;
34 fSrcRect.roundOut(&srcRect); 34 fSrcRect.roundOut(&srcRect);
35 SkBitmap subset; 35 SkBitmap subset;
36 if (!source.extractSubset(&subset, srcRect)) { 36 if (!source.extractSubset(&subset, srcRect)) {
37 return false; 37 return false;
38 } 38 }
39 39
40 SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(w, h)); 40 SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(w, h));
41 if (NULL == device.get()) {
42 return false;
43 }
41 SkIRect bounds; 44 SkIRect bounds;
42 source.getBounds(&bounds); 45 source.getBounds(&bounds);
43 SkCanvas canvas(device); 46 SkCanvas canvas(device);
44 SkPaint paint; 47 SkPaint paint;
45 paint.setXfermodeMode(SkXfermode::kSrc_Mode); 48 paint.setXfermodeMode(SkXfermode::kSrc_Mode);
46 49
47 SkAutoTUnref<SkShader> shader(SkShader::CreateBitmapShader(subset, 50 SkAutoTUnref<SkShader> shader(SkShader::CreateBitmapShader(subset,
48 SkShader::kRepeat_TileMode, SkShader::kRepeat_ TileMode)); 51 SkShader::kRepeat_TileMode, SkShader::kRepeat_ TileMode));
49 paint.setShader(shader); 52 paint.setShader(shader);
50 SkRect dstRect = fDstRect; 53 SkRect dstRect = fDstRect;
51 dstRect.offset(SkIntToScalar(localOffset.fX), SkIntToScalar(localOffset.fY)) ; 54 dstRect.offset(SkIntToScalar(localOffset.fX), SkIntToScalar(localOffset.fY)) ;
52 canvas.drawRect(dstRect, paint); 55 canvas.drawRect(dstRect, paint);
53 *dst = device->accessBitmap(false); 56 *dst = device->accessBitmap(false);
54 return true; 57 return true;
55 } 58 }
56 59
57 SkTileImageFilter::SkTileImageFilter(SkFlattenableReadBuffer& buffer) 60 SkTileImageFilter::SkTileImageFilter(SkFlattenableReadBuffer& buffer)
58 : INHERITED(1, buffer) { 61 : INHERITED(1, buffer) {
59 buffer.readRect(&fSrcRect); 62 buffer.readRect(&fSrcRect);
60 buffer.readRect(&fDstRect); 63 buffer.readRect(&fDstRect);
61 buffer.validate(SkIsValidRect(fSrcRect) && SkIsValidRect(fDstRect)); 64 buffer.validate(SkIsValidRect(fSrcRect) && SkIsValidRect(fDstRect));
62 } 65 }
63 66
64 void SkTileImageFilter::flatten(SkFlattenableWriteBuffer& buffer) const { 67 void SkTileImageFilter::flatten(SkFlattenableWriteBuffer& buffer) const {
65 this->INHERITED::flatten(buffer); 68 this->INHERITED::flatten(buffer);
66 buffer.writeRect(fSrcRect); 69 buffer.writeRect(fSrcRect);
67 buffer.writeRect(fDstRect); 70 buffer.writeRect(fDstRect);
68 } 71 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698