src/core/SkValidatingReadBuffer.cpp - Issue 195223003: Fixing SkPicture serialization

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

Unified Diff: src/core/SkValidatingReadBuffer.cpp

Issue 195223003: Fixing SkPicture serialization (Closed) Base URL: https://skia.googlesource.com/skia.git@master

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

Index: src/core/SkValidatingReadBuffer.cpp

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

index ae7a83684bc818dcb267f9466cb4002804ed0f07..1127a89a6037403287d7ea518a03e25a12a40cd8 100644

--- a/src/core/SkValidatingReadBuffer.cpp

+++ b/src/core/SkValidatingReadBuffer.cpp

@@ -213,9 +213,10 @@ uint32_t SkValidatingReadBuffer::getArrayCount() {

void SkValidatingReadBuffer::readBitmap(SkBitmap* bitmap) {

const int width = this->readInt();

const int height = this->readInt();

+ const bool useBitmapHeap = this->readBool();

const size_t length = this->readUInt();

// A size of zero means the SkBitmap was simply flattened.

- this->validate(length == 0);

+ this->validate(!useBitmapHeap && (0 == length));

if (fError) {

Stephen White 2014/03/11 18:14:43 Nit: could this just be if (!this->validate(...)

sugoi1 2014/03/11 18:54:04 Done.

return;

}