| Index: src/effects/SkLightingImageFilter.cpp
|
| diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp
|
| index ca52b981e53bde666af997597ae00c0b3a4164dd..dfcdad1cb54dca88d35e1322e180f7489bae297c 100644
|
| --- a/src/effects/SkLightingImageFilter.cpp
|
| +++ b/src/effects/SkLightingImageFilter.cpp
|
| @@ -259,6 +259,8 @@ void writePoint3(const SkPoint3& point, SkFlattenableWriteBuffer& buffer) {
|
| };
|
|
|
| class SkDiffuseLightingImageFilter : public SkLightingImageFilter {
|
| + typedef SkLightingImageFilter INHERITED;
|
| +
|
| public:
|
| SkDiffuseLightingImageFilter(SkLight* light, SkScalar surfaceScale,
|
| SkScalar kd, SkImageFilter* input, const SkIRect* cropRect);
|
| @@ -277,11 +279,12 @@ protected:
|
|
|
|
|
| private:
|
| - typedef SkLightingImageFilter INHERITED;
|
| SkScalar fKD;
|
| };
|
|
|
| class SkSpecularLightingImageFilter : public SkLightingImageFilter {
|
| + typedef SkLightingImageFilter INHERITED;
|
| +
|
| public:
|
| SkSpecularLightingImageFilter(SkLight* light, SkScalar surfaceScale, SkScalar ks, SkScalar shininess, SkImageFilter* input, const SkIRect* cropRect);
|
| SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkSpecularLightingImageFilter)
|
| @@ -300,7 +303,6 @@ protected:
|
| SkBitmap* result, SkIPoint* offset) SK_OVERRIDE;
|
|
|
| private:
|
| - typedef SkLightingImageFilter INHERITED;
|
| SkScalar fKS;
|
| SkScalar fShininess;
|
| };
|
| @@ -509,6 +511,8 @@ class GrGLLight;
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|
| class SkLight : public SkFlattenable {
|
| + typedef SkFlattenable INHERITED;
|
| +
|
| public:
|
| SK_DECLARE_INST_COUNT(SkLight)
|
|
|
| @@ -544,7 +548,6 @@ protected:
|
| }
|
|
|
| private:
|
| - typedef SkFlattenable INHERITED;
|
| SkPoint3 fColor;
|
| };
|
|
|
| @@ -553,6 +556,8 @@ SK_DEFINE_INST_COUNT(SkLight)
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|
| class SkDistantLight : public SkLight {
|
| + typedef SkLight INHERITED;
|
| +
|
| public:
|
| SkDistantLight(const SkPoint3& direction, SkColor color)
|
| : INHERITED(color), fDirection(direction) {
|
| @@ -602,13 +607,14 @@ protected:
|
| }
|
|
|
| private:
|
| - typedef SkLight INHERITED;
|
| SkPoint3 fDirection;
|
| };
|
|
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|
| class SkPointLight : public SkLight {
|
| + typedef SkLight INHERITED;
|
| +
|
| public:
|
| SkPointLight(const SkPoint3& location, SkColor color)
|
| : INHERITED(color), fLocation(location) {}
|
| @@ -661,13 +667,14 @@ protected:
|
| }
|
|
|
| private:
|
| - typedef SkLight INHERITED;
|
| SkPoint3 fLocation;
|
| };
|
|
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|
| class SkSpotLight : public SkLight {
|
| + typedef SkLight INHERITED;
|
| +
|
| public:
|
| SkSpotLight(const SkPoint3& location, const SkPoint3& target, SkScalar specularExponent, SkScalar cutoffAngle, SkColor color)
|
| : INHERITED(color),
|
| @@ -781,7 +788,6 @@ private:
|
| static const SkScalar kSpecularExponentMin;
|
| static const SkScalar kSpecularExponentMax;
|
|
|
| - typedef SkLight INHERITED;
|
| SkPoint3 fLocation;
|
| SkPoint3 fTarget;
|
| SkScalar fSpecularExponent;
|
|
|