AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add missing null device checks in SkCanvas

Browse Source 
Review URL: https://codereview.appspot.com/6092056

git-svn-id: http://skia.googlecode.com/svn/trunk@3810 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
djsollen@google.com 2012-05-01 16:50:10 +00:00
parent 9d5f76a250
commit ccfee2a362
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/SkCanvas.cpp
View File

@ -604,6 +604,9 @@ bool SkCanvas::readPixels(SkBitmap* bitmap,
bool SkCanvas::readPixels(const SkIRect& srcRect, SkBitmap* bitmap) { bool SkCanvas::readPixels(const SkIRect& srcRect, SkBitmap* bitmap) {
SkDevice* device = this->getDevice(); SkDevice* device = this->getDevice();
if (!device) {
return false;
}
SkIRect bounds; SkIRect bounds;
bounds.set(0, 0, device->width(), device->height()); bounds.set(0, 0, device->width(), device->height());
@ -1129,6 +1132,10 @@ static bool clipPathHelper(const SkCanvas* canvas, SkRasterClip* currClip,
} }
} else { } else {
const SkDevice* device = canvas->getDevice(); const SkDevice* device = canvas->getDevice();
if (!device) {
return currClip->setEmpty();
}
base.setRect(0, 0, device->width(), device->height()); base.setRect(0, 0, device->width(), device->height());
if (SkRegion::kReplace_Op == op) { if (SkRegion::kReplace_Op == op) {
@ -1185,6 +1192,11 @@ bool SkCanvas::clipRegion(const SkRegion& rgn, SkRegion::Op op) {
void SkCanvas::validateClip() const { void SkCanvas::validateClip() const {
// construct clipRgn from the clipstack // construct clipRgn from the clipstack
const SkDevice* device = this->getDevice(); const SkDevice* device = this->getDevice();
if (!device) {
SkASSERT(this->getTotalClip().isEmpty());
return;
}
SkIRect ir; SkIRect ir;
ir.set(0, 0, device->width(), device->height()); ir.set(0, 0, device->width(), device->height());
SkRasterClip tmpClip(ir); SkRasterClip tmpClip(ir);