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

Fix broken debug build

Browse Source 
BUG=skia:
R=tomhudson@google.com

Author: iancottrell@google.com

Review URL: https://codereview.chromium.org/143223005

git-svn-id: http://skia.googlecode.com/svn/trunk@13397 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
commit-bot@chromium.org 2014-02-11 11:18:12 +00:00
parent 046f1f6ff4
commit afe38b16f0
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/SkWriter32.cpp
View File

@ -81,6 +81,6 @@ void SkWriter32::growToAtLeast(size_t size) {
// Expand the array so all reserved space is "used", we maintain the
// amount we have written manually outside the array
fInternal.setCount(fCapacity);
SkASSERT(fInternal.count() == fCapacity);
SkASSERT(fInternal.reserved() == fCapacity);
SkASSERT(fInternal.count() == (int)fCapacity);
SkASSERT(fInternal.reserved() == (int)fCapacity);
}

14
tests/Writer32Test.cpp
View File

@ -203,17 +203,9 @@ DEF_TEST(Writer32_contiguous, reporter) {
test1(reporter, &writer);
REPORTER_ASSERT(reporter, writer.contiguousArray() != NULL);
// This write is too big for the 32 byte storage block we provide.
writer.reset(storage, 32);
test2(reporter, &writer);
// Some data is in storage, some in writer's internal storage.
REPORTER_ASSERT(reporter, writer.contiguousArray() == NULL);
writer.reset();
test2(reporter, &writer);
// There is no external storage. All the data is in internal storage,
// so we can always read it contiguously.
REPORTER_ASSERT(reporter, writer.contiguousArray() != NULL);
// Everything other aspect of contiguous/non-contiguous is an
// implementation detail, not part of the public contract for
// SkWriter32, and so not tested here.
}
DEF_TEST(Writer32_small, reporter) {