diff options
| author |  robertphillips <robertphillips@google.com> | 2015-08-06 07:08:31 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-06 07:08:31 -0700 |
| commit | d0cf9d831f7f4c98d48f52e6850db4ade1dd9422 (patch) | |
| tree | 63fab595eae0e21083ab4d18a6c0eb64330bf5e7 | |
| parent | e2639089bddc4fbb129ae039cb12c01be087b397 (diff) | |
Remove SK_LEGACY_SKPOINT3_CTORS flag
Cannot land before Blink https://codereview.chromium.org/1274673002/ (Remove reliance on legacy Skia SkPoint3 ctors in FELighting.cpp)
Review URL: https://codereview.chromium.org/1269383003
| -rw-r--r-- | gyp/skia_for_chromium_defines.gypi | 1 | ||||
| -rw-r--r-- | include/effects/SkLightingImageFilter.h | 7 | ||||
| -rw-r--r-- | include/effects/SkPoint3.h | 6 |
3 files changed, 1 insertions, 13 deletions
diff --git a/gyp/skia_for_chromium_defines.gypi b/gyp/skia_for_chromium_defines.gypi index a1f323c88e..a148a83a01 100644 --- a/gyp/skia_for_chromium_defines.gypi +++ b/gyp/skia_for_chromium_defines.gypi @@ -14,7 +14,6 @@ # 'skia_for_chromium_defines': [ 'SK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS', - 'SK_LEGACY_SKPOINT3_CTORS', ], }, } diff --git a/include/effects/SkLightingImageFilter.h b/include/effects/SkLightingImageFilter.h index 326e7b8967..c481050d49 100644 --- a/include/effects/SkLightingImageFilter.h +++ b/include/effects/SkLightingImageFilter.h @@ -11,14 +11,9 @@ #include "SkImageFilter.h" #include "SkColor.h" -#ifdef SK_LEGACY_SKPOINT3_CTORS -// TODO: remove this. Chromium relies on having this included here -#include "SkPoint3.h" -#else -struct SkPoint3; -#endif class SkLight; +struct SkPoint3; class SK_API SkLightingImageFilter : public SkImageFilter { public: diff --git a/include/effects/SkPoint3.h b/include/effects/SkPoint3.h index c086931c08..f31f8207ab 100644 --- a/include/effects/SkPoint3.h +++ b/include/effects/SkPoint3.h @@ -13,12 +13,6 @@ struct SK_API SkPoint3 { SkScalar fX, fY, fZ; -#ifdef SK_LEGACY_SKPOINT3_CTORS - // TODO: remove these - they are needed for Chromium staging - SkPoint3() {} - SkPoint3(SkScalar x, SkScalar y, SkScalar z) : fX(x), fY(y), fZ(z) {} -#endif - static SkPoint3 Make(SkScalar x, SkScalar y, SkScalar z) { SkPoint3 pt; pt.set(x, y, z); |