From 343fe49b82d5b220d64c64f253bb362026006632 Mon Sep 17 00:00:00 2001 From: Jim Van Verth Date: Tue, 2 May 2017 16:49:24 -0400 Subject: Remove translateZ and lights from SkCanvas Bug: skia:6557 Change-Id: I0dbf70c4131ab59e7fc6c674a6587767af98e13a Reviewed-on: https://skia-review.googlesource.com/15151 Commit-Queue: Jim Van Verth Reviewed-by: Mike Klein --- tests/CanvasTest.cpp | 56 ---------------------------------------------------- 1 file changed, 56 deletions(-) (limited to 'tests/CanvasTest.cpp') diff --git a/tests/CanvasTest.cpp b/tests/CanvasTest.cpp index cca692b47a..b304a0d253 100644 --- a/tests/CanvasTest.cpp +++ b/tests/CanvasTest.cpp @@ -658,46 +658,6 @@ DEF_TEST(Canvas_ClipEmptyPath, reporter) { canvas.restore(); } -#define SHADOW_TEST_CANVAS_CONST 10 -#ifdef SK_EXPERIMENTAL_SHADOWING -class SkShadowTestCanvas : public SkPaintFilterCanvas { -public: - - SkShadowTestCanvas(int x, int y, skiatest::Reporter* reporter) - : INHERITED(x,y) - , fReporter(reporter) {} - - bool onFilter(SkTCopyOnFirstWrite* paint, Type type) const { - REPORTER_ASSERT(this->fReporter, this->getZ() == SHADOW_TEST_CANVAS_CONST); - - return true; - } - - void testUpdateDepth(skiatest::Reporter *reporter) { - // set some depths (with picture enabled), then check them as they get set - - REPORTER_ASSERT(reporter, this->getZ() == 0); - this->translateZ(-10); - REPORTER_ASSERT(reporter, this->getZ() == -10); - - this->save(); - this->translateZ(20); - REPORTER_ASSERT(reporter, this->getZ() == 10); - - this->restore(); - REPORTER_ASSERT(reporter, this->getZ() == -10); - - this->translateZ(13.14f); - REPORTER_ASSERT(reporter, SkScalarNearlyEqual(this->getZ(), 3.14f)); - } - -private: - skiatest::Reporter* fReporter; - - typedef SkPaintFilterCanvas INHERITED; -}; -#endif - namespace { class MockFilterCanvas : public SkPaintFilterCanvas { @@ -727,22 +687,6 @@ DEF_TEST(PaintFilterCanvas_ConsistentState, reporter) { filterCanvas.scale(0.75f, 0.5f); REPORTER_ASSERT(reporter, canvas.getTotalMatrix() == filterCanvas.getTotalMatrix()); REPORTER_ASSERT(reporter, filterCanvas.getLocalClipBounds().contains(canvas.getLocalClipBounds())); - -#ifdef SK_EXPERIMENTAL_SHADOWING - SkShadowTestCanvas* tCanvas = new SkShadowTestCanvas(100,100, reporter); - tCanvas->testUpdateDepth(reporter); - delete(tCanvas); - - SkPictureRecorder recorder; - SkShadowTestCanvas *tSCanvas = new SkShadowTestCanvas(100, 100, reporter); - SkCanvas *tPCanvas = recorder.beginRecording(SkRect::MakeIWH(100, 100)); - - tPCanvas->translateZ(SHADOW_TEST_CANVAS_CONST); - sk_sp pic = recorder.finishRecordingAsPicture(); - tSCanvas->drawPicture(pic); - - delete(tSCanvas); -#endif } /////////////////////////////////////////////////////////////////////////////////////////////////// -- cgit v1.2.3