Revert of Creating framework for drawShadowedPicture

tests/CanvasTest.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 /*  Description:
  *      This test defines a series of elementatry test steps that perform
  *      a single or a small group of canvas API calls. Each test step is
@@ skipping 762 matching lines @@
     path.moveTo(5, 5);
     canvas.clipPath(path);
     canvas.restore();
     canvas.save();
     path.moveTo(7, 7);
     canvas.clipPath(path);  // should not assert here
     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<SkPaint>* paint, Type type) const {
         REPORTER_ASSERT(this->fReporter, this->getZ() == SHADOW_TEST_CANVAS_CONST);
 
@@ skipping 16 matching lines @@
 
         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 {
 public:
     MockFilterCanvas(SkCanvas* canvas) : INHERITED(canvas) { }
 
 protected:
     bool onFilter(SkTCopyOnFirstWrite<SkPaint>*, Type) const override { return true; }
 
@@ skipping 15 matching lines @@
     REPORTER_ASSERT(reporter, canvas.getTotalMatrix() == filterCanvas.getTotalMatrix());
     REPORTER_ASSERT(reporter, canvas.getClipBounds(&clip1) == filterCanvas.getClipBounds(&clip2));
     REPORTER_ASSERT(reporter, clip1 == clip2);
 
     filterCanvas.clipRect(SkRect::MakeXYWH(30.5f, 30.7f, 100, 100));
     filterCanvas.scale(0.75f, 0.5f);
     REPORTER_ASSERT(reporter, canvas.getTotalMatrix() == filterCanvas.getTotalMatrix());
     REPORTER_ASSERT(reporter, canvas.getClipBounds(&clip1) == filterCanvas.getClipBounds(&clip2));
     REPORTER_ASSERT(reporter, clip1 == clip2);
 
-#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<SkPicture> pic = recorder.finishRecordingAsPicture();
     tSCanvas->drawPicture(pic);
 
     delete(tSCanvas);
-#endif
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #include "SkDeferredCanvas.h"
 #include "SkDumpCanvas.h"
 
 DEF_TEST(DeferredCanvas, r) {
     SkDebugfDumper dumper;
     SkDumpCanvas dumpC(&dumper);
 
     SkDeferredCanvas canvas(&dumpC);
 
     SkPaint paint;
 //    paint.setShader(SkShader::MakeColorShader(SK_ColorRED));
 
     canvas.save();
     canvas.clipRect(SkRect::MakeWH(55, 55));
     canvas.translate(10, 20);
     canvas.drawRect(SkRect::MakeWH(50, 50), paint);
     canvas.restore();
 }