Creating framework for drawShadowedPicture

tools/debugger/SkDebugCanvas.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.
  */
 
 #include "SkCanvasPriv.h"
 #include "SkClipStack.h"
 #include "SkDebugCanvas.h"
@@ skipping 40 matching lines @@
         return true;
     }
 
     void onDrawPicture(const SkPicture* picture,
                        const SkMatrix* matrix,
                        const SkPaint* paint) override {
         // We need to replay the picture onto this canvas in order to filter its internal paints.
         this->SkCanvas::onDrawPicture(picture, matrix, paint);
     }
 
+    void onDrawShadowedPicture(const SkPicture* picture,
+                               const SkMatrix* matrix,
+                               const SkPaint* paint)
+#ifdef SK_USE_SHADOWS
+    override

[jvanverth1, 2016/07/21 13:56:53]

You don't need override in the definition.

[vjiaoblack, 2016/07/21 15:11:20]

Done.

+#endif
+    {
+#ifdef SK_USE_SHADOWS
+        this->SkCanvas::onDrawShadowedPicture(picture, matrix, paint);
+#else
+        this->SkCanvas::onDrawPicture(picture, matrix, paint);
+#endif
+    }
+
 private:
     sk_sp<SkXfermode> fOverdrawXfermode;
 
     bool fOverrideFilterQuality;
     SkFilterQuality fFilterQuality;
 
     typedef SkPaintFilterCanvas INHERITED;
 };
 
 SkDebugCanvas::SkDebugCanvas(int width, int height)
@@ skipping 525 matching lines @@
 
 void SkDebugCanvas::onDrawPicture(const SkPicture* picture,
                                   const SkMatrix* matrix,
                                   const SkPaint* paint) {
     this->addDrawCommand(new SkBeginDrawPictureCommand(picture, matrix, paint));
     SkAutoCanvasMatrixPaint acmp(this, matrix, paint, picture->cullRect());
     picture->playback(this);
     this->addDrawCommand(new SkEndDrawPictureCommand(SkToBool(matrix) || SkToBool(paint)));
 }
 
+void SkDebugCanvas::onDrawShadowedPicture(const SkPicture* picture,
+                                          const SkMatrix* matrix,
+                                          const SkPaint* paint) {
+    this->addDrawCommand(new SkBeginDrawShadowedPictureCommand(picture, matrix, paint));
+    SkAutoCanvasMatrixPaint acmp(this, matrix, paint, picture->cullRect());
+    picture->playback(this);
+    this->addDrawCommand(new SkEndDrawShadowedPictureCommand(SkToBool(matrix) || SkToBool(paint)));
+}
+
 void SkDebugCanvas::onDrawPoints(PointMode mode, size_t count,
                                  const SkPoint pts[], const SkPaint& paint) {
     this->addDrawCommand(new SkDrawPointsCommand(mode, count, pts, paint));
 }
 
 void SkDebugCanvas::onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[],
                                   const SkPaint& paint) {
     this->addDrawCommand(new SkDrawPosTextCommand(text, byteLength, pos, paint));
 }
 
@@ skipping 68 matching lines @@
     // No need for a full layer.
     return kNoLayer_SaveLayerStrategy;
 }
 
 void SkDebugCanvas::didSetMatrix(const SkMatrix& matrix) {
     this->addDrawCommand(new SkSetMatrixCommand(matrix));
     this->INHERITED::didSetMatrix(matrix);
 }
 
 void SkDebugCanvas::didTranslateZ(SkScalar z) {
+#ifdef SK_USE_SHADOWS
     this->addDrawCommand(new SkTranslateZCommand(z));
     this->INHERITED::didTranslateZ(z);
+#endif
 }
 
 void SkDebugCanvas::toggleCommand(int index, bool toggle) {
     SkASSERT(index < fCommandVector.count());
     fCommandVector[index]->setVisible(toggle);
 }
 
 static const char* gFillTypeStrs[] = {
     "kWinding_FillType",
     "kEvenOdd_FillType",
@@ skipping 111 matching lines @@
 }
 
 bool SkDebugCanvas::lastClipStackData(const SkPath& devPath) {
     if (fCalledAddStackData) {
         fClipStackData.appendf("<br>");
         addPathData(devPath, "pathOut");
         return true;
     }
     return false;
 }