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

Removing dead code from CanvasTest

Browse Source 
BUG=skia:3054

Review URL: https://codereview.chromium.org/681083002
This commit is contained in:
piotaixr 2014-10-28 11:13:59 -07:00 committed by Commit bot
parent 6d22ecaa71
commit 5ae89d1fa8
2 changed files with 0 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/SkPictureRecord.h
View File

@ -258,7 +258,6 @@ private:
int fInitialSaveCount;
friend class SkPictureData; // for SkPictureData's SkPictureRecord-based constructor
friend class SkPictureTester; // for unit testing
typedef SkCanvas INHERITED;
};

47
tests/CanvasTest.cpp
View File

@ -596,53 +596,6 @@ static void AssertCanvasStatesEqual(skiatest::Reporter* reporter, const TestData
}
// The following class groups static functions that need to access
// the privates members of SkPictureRecord
class SkPictureTester {
private:
static int EQ(const SkFlatData* a, const SkFlatData* b) {
return *a == *b;
}
static void AssertFlattenedObjectsEqual(
SkPictureRecord* referenceRecord,
SkPictureRecord* testRecord,
skiatest::Reporter* reporter,
CanvasTestStep* testStep) {
REPORTER_ASSERT_MESSAGE(reporter,
referenceRecord->fBitmapHeap->count() ==
testRecord->fBitmapHeap->count(), testStep->assertMessage());
REPORTER_ASSERT_MESSAGE(reporter,
referenceRecord->fPaints.count() ==
testRecord->fPaints.count(), testStep->assertMessage());
for (int i = 0; i < referenceRecord->fPaints.count(); ++i) {
REPORTER_ASSERT_MESSAGE(reporter,
EQ(referenceRecord->fPaints[i], testRecord->fPaints[i]),
testStep->assertMessage());
}
REPORTER_ASSERT_MESSAGE(reporter,
!referenceRecord->fPathHeap == !testRecord->fPathHeap,
testStep->assertMessage());
// The following tests are commented out because they currently
// fail. Issue: http://code.google.com/p/skia/issues/detail?id=507
/*
if (referenceRecord->fPathHeap) {
REPORTER_ASSERT_MESSAGE(reporter,
referenceRecord->fPathHeap->count() ==
testRecord->fPathHeap->count(),
testStep->assertMessage());
for (int i = 0; i < referenceRecord->fPathHeap->count(); ++i) {
REPORTER_ASSERT_MESSAGE(reporter,
(*referenceRecord->fPathHeap)[i] ==
(*testRecord->fPathHeap)[i], testStep->assertMessage());
}
}
*/
}
};
static void TestPdfDevice(skiatest::Reporter* reporter,
const TestData& d,
CanvasTestStep* testStep) {