src/core/SkImageFilter.cpp - Issue 23021015: Initial error handling code - Code Review

Chromium Code Reviews

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

(137)

My Issues | Starred Open | Closed | All

Unified Diff: src/core/SkImageFilter.cpp

Issue 23021015: Initial error handling code (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: Serialization with strings as ID Created 7 years, 2 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 side-by-side diff with in-line comments

« src/core/SkFlattenableBuffers.cpp ('K') | « src/core/SkGraphics.cpp ('k') | src/core/SkOrderedReadBuffer.h » ('j') | src/core/SkOrderedWriteBuffer.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: src/core/SkImageFilter.cpp

diff --git a/src/core/SkImageFilter.cpp b/src/core/SkImageFilter.cpp

index 502613bb68835caf66d4dcb4d893b90b6697a1ad..eaa11a334b8d9d4ad893cc8d78f33c8cc6015ebe 100644

--- a/src/core/SkImageFilter.cpp

+++ b/src/core/SkImageFilter.cpp

@@ -10,6 +10,7 @@

#include "SkBitmap.h"

#include "SkFlattenableBuffers.h"

#include "SkRect.h"

+#include "SkValidationUtils.h"

#if SK_SUPPORT_GPU

#include "GrContext.h"

#include "GrTexture.h"

@@ -62,6 +63,9 @@ SkImageFilter::SkImageFilter(SkFlattenableReadBuffer& buffer)

}

}

buffer.readIRect(&fCropRect);

+ // Do not use SkIsValidRect() here, since width() and height() are allowed

+ // to be larger than SK_MaxS32 in this specific case. Check inversion instead.

+ buffer.validate(!fCropRect.isInverted());

}

void SkImageFilter::flatten(SkFlattenableWriteBuffer& buffer) const {

« src/core/SkFlattenableBuffers.cpp ('K') | « src/core/SkGraphics.cpp ('k') | src/core/SkOrderedReadBuffer.h » ('j') | src/core/SkOrderedWriteBuffer.cpp » ('J')

Powered by Google App Engine

This is Rietveld 408576698