remove EdgeType enum. Unimportant distinction, and removing speeds up quickReject
Review URL: https://codereview.appspot.com/6448161
git-svn-id: http://skia.googlecode.com/svn/trunk@5140 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/CanvasTest.cpp b/tests/CanvasTest.cpp
index 1d8e3cd..3ff6d4b 100644
--- a/tests/CanvasTest.cpp
+++ b/tests/CanvasTest.cpp
@@ -530,49 +530,49 @@
testStep->assertMessage());
}
TEST_STEP(DrawLayer, DrawLayerTestStep);
-
-static void NestedSaveRestoreWithSolidPaintTestStep(SkCanvas* canvas,
- skiatest::Reporter* reporter,
- CanvasTestStep* testStep) {
- // This test step challenges the TestDeferredCanvasStateConsistency
- // test cases because the opaque paint can trigger an optimization
- // that discards previously recorded commands. The challenge is to maintain
- // correct clip and matrix stack state.
- canvas->resetMatrix();
- canvas->rotate(SkIntToScalar(30));
- canvas->save();
- canvas->translate(SkIntToScalar(2), SkIntToScalar(1));
- canvas->save();
- canvas->scale(SkIntToScalar(3), SkIntToScalar(3));
- SkPaint paint;
- paint.setColor(0xFFFFFFFF);
- canvas->drawPaint(paint);
- canvas->restore();
- canvas->restore();
-}
-TEST_STEP(NestedSaveRestoreWithSolidPaint, \
- NestedSaveRestoreWithSolidPaintTestStep);
-
-static void NestedSaveRestoreWithFlushTestStep(SkCanvas* canvas,
- skiatest::Reporter* reporter,
- CanvasTestStep* testStep) {
- // This test step challenges the TestDeferredCanvasStateConsistency
- // test case because the canvas flush on a deferred canvas will
- // reset the recording session. The challenge is to maintain correct
- // clip and matrix stack state on the playback canvas.
- canvas->resetMatrix();
- canvas->rotate(SkIntToScalar(30));
- canvas->save();
- canvas->translate(SkIntToScalar(2), SkIntToScalar(1));
- canvas->save();
- canvas->scale(SkIntToScalar(3), SkIntToScalar(3));
- canvas->drawRect(kTestRect,kTestPaint);
- canvas->flush();
- canvas->restore();
- canvas->restore();
-}
-TEST_STEP(NestedSaveRestoreWithFlush, \
- NestedSaveRestoreWithFlushTestStep);
+
+static void NestedSaveRestoreWithSolidPaintTestStep(SkCanvas* canvas,
+ skiatest::Reporter* reporter,
+ CanvasTestStep* testStep) {
+ // This test step challenges the TestDeferredCanvasStateConsistency
+ // test cases because the opaque paint can trigger an optimization
+ // that discards previously recorded commands. The challenge is to maintain
+ // correct clip and matrix stack state.
+ canvas->resetMatrix();
+ canvas->rotate(SkIntToScalar(30));
+ canvas->save();
+ canvas->translate(SkIntToScalar(2), SkIntToScalar(1));
+ canvas->save();
+ canvas->scale(SkIntToScalar(3), SkIntToScalar(3));
+ SkPaint paint;
+ paint.setColor(0xFFFFFFFF);
+ canvas->drawPaint(paint);
+ canvas->restore();
+ canvas->restore();
+}
+TEST_STEP(NestedSaveRestoreWithSolidPaint, \
+ NestedSaveRestoreWithSolidPaintTestStep);
+
+static void NestedSaveRestoreWithFlushTestStep(SkCanvas* canvas,
+ skiatest::Reporter* reporter,
+ CanvasTestStep* testStep) {
+ // This test step challenges the TestDeferredCanvasStateConsistency
+ // test case because the canvas flush on a deferred canvas will
+ // reset the recording session. The challenge is to maintain correct
+ // clip and matrix stack state on the playback canvas.
+ canvas->resetMatrix();
+ canvas->rotate(SkIntToScalar(30));
+ canvas->save();
+ canvas->translate(SkIntToScalar(2), SkIntToScalar(1));
+ canvas->save();
+ canvas->scale(SkIntToScalar(3), SkIntToScalar(3));
+ canvas->drawRect(kTestRect,kTestPaint);
+ canvas->flush();
+ canvas->restore();
+ canvas->restore();
+}
+TEST_STEP(NestedSaveRestoreWithFlush, \
+ NestedSaveRestoreWithFlushTestStep);
static void AssertCanvasStatesEqual(skiatest::Reporter* reporter,
const SkCanvas* canvas1,
@@ -584,19 +584,14 @@
canvas2->getSaveCount(), testStep->assertMessage());
REPORTER_ASSERT_MESSAGE(reporter, canvas1->isDrawingToLayer() ==
canvas2->isDrawingToLayer(), testStep->assertMessage());
+
SkRect bounds1, bounds2;
REPORTER_ASSERT_MESSAGE(reporter,
- canvas1->getClipBounds(&bounds1, SkCanvas::kAA_EdgeType) ==
- canvas2->getClipBounds(&bounds2, SkCanvas::kAA_EdgeType),
+ canvas1->getClipBounds(&bounds1) == canvas2->getClipBounds(&bounds2),
testStep->assertMessage());
REPORTER_ASSERT_MESSAGE(reporter, bounds1 == bounds2,
- testStep->assertMessage());
- REPORTER_ASSERT_MESSAGE(reporter,
- canvas1->getClipBounds(&bounds1, SkCanvas::kBW_EdgeType) ==
- canvas2->getClipBounds(&bounds2, SkCanvas::kBW_EdgeType),
- testStep->assertMessage());
- REPORTER_ASSERT_MESSAGE(reporter, bounds1 == bounds2,
- testStep->assertMessage());
+ testStep->assertMessage());
+
REPORTER_ASSERT_MESSAGE(reporter, canvas1->getDrawFilter() ==
canvas2->getDrawFilter(), testStep->assertMessage());
SkIRect deviceBounds1, deviceBounds2;