diff options
| author |  vjiaoblack <vjiaoblack@google.com> | 2016-07-22 10:04:15 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-07-22 10:04:15 -0700 |
| commit | 5bfee98c8cf59db8d71aa6672088b107f0abf8c9 (patch) | |
| tree | 69c3406f540e6697ccdccc983a51c1f1e9323e22 | |
| parent | cbecb082d15da3c9cc5ac7192b243fd26dc29a57 (diff) | |
Creating framework for drawShadowedPicture
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2146073003
Committed: https://skia.googlesource.com/skia/+/0ae097d116f4332be02a135ffc99c162473dee6a
Committed: https://skia.googlesource.com/skia/+/95302da19d8b0a3bcd9d9be0e79f486760787f09
Review-Url: https://codereview.chromium.org/2146073003
| -rw-r--r-- | include/core/SkCanvas.h | 2 | ||||
| -rw-r--r-- | src/core/SkPictureRecord.h | 4 | ||||
| -rw-r--r-- | tools/debugger/SkDebugCanvas.h | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h index 38b6f974cc..3f9b034946 100644 --- a/include/core/SkCanvas.h +++ b/include/core/SkCanvas.h @@ -1455,7 +1455,7 @@ protected: const SkMatrix*, const SkPaint*); #endif - + // Returns the canvas to be used by DrawIter. Default implementation // returns this. Subclasses that encapsulate an indirect canvas may // need to overload this method. The impl must keep track of this, as it diff --git a/src/core/SkPictureRecord.h b/src/core/SkPictureRecord.h index 5f51a0e12d..b798234a72 100644 --- a/src/core/SkPictureRecord.h +++ b/src/core/SkPictureRecord.h @@ -161,7 +161,7 @@ protected: #ifdef SK_EXPERIMENTAL_SHADOWING void didTranslateZ(SkScalar) override; -#endif +#else void didTranslateZ(SkScalar); #endif @@ -268,3 +268,5 @@ private: typedef SkCanvas INHERITED; }; + +#endif diff --git a/tools/debugger/SkDebugCanvas.h b/tools/debugger/SkDebugCanvas.h index 9f785ef7f3..851dfe1bd4 100644 --- a/tools/debugger/SkDebugCanvas.h +++ b/tools/debugger/SkDebugCanvas.h @@ -205,7 +205,7 @@ protected: void didSetMatrix(const SkMatrix &) override; #ifdef SK_EXPERIMENTAL_SHADOWING - void didTranslateZ(SkScalar) override; + void didTranslateZ(SkScalar) override; #else void didTranslateZ(SkScalar); #endif |