commit 6730cbb80a2366c1333f48b7cd0397daed337a8b
author senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jul 11 16:35:00 2012 +0000
committer senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jul 11 16:35:00 2012 +0000
tree 4bd655aa5d8a81c9a90b553e48255002c26e9aa2
parent bd9fad67b841e94e2042bbc424f197887fe7c00e

More build fixes; unreviewed.



git-svn-id: http://skia.googlecode.com/svn/trunk@4537 2bbb7eff-a529-9590-31e7-b0007b416f81

src/effects/SkLightingImageFilter.cpp

diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp
index 2033e25..9b8fb0f 100644
--- a/src/effects/SkLightingImageFilter.cpp
+++ b/src/effects/SkLightingImageFilter.cpp
@@ -342,6 +342,7 @@
 
 class GrGLLight {
 public:
+    virtual ~GrGLLight() {}
     virtual void setupVariables(GrGLShaderBuilder* state, int stage);
     virtual void emitVS(SkString* builder) const {}
     virtual void emitFuncs(SkString* builder) const {}
@@ -362,6 +363,7 @@
 
 class GrGLDistantLight : public GrGLLight {
 public:
+    virtual ~GrGLDistantLight() {}
     virtual void setupVariables(GrGLShaderBuilder* state, int stage) SK_OVERRIDE;
     virtual void initUniforms(const GrGLInterface* gl, int programID) SK_OVERRIDE;
     virtual void setData(const GrGLInterface* gl, const SkLight* light) const SK_OVERRIDE;
@@ -377,6 +379,7 @@
 
 class GrGLPointLight : public GrGLLight {
 public:
+    virtual ~GrGLPointLight() {}
     virtual void setupVariables(GrGLShaderBuilder* state, int stage);
     virtual void initUniforms(const GrGLInterface* gl, int programID);
     virtual void setData(const GrGLInterface* gl, const SkLight* light) const SK_OVERRIDE;
@@ -395,6 +398,7 @@
 
 class GrGLSpotLight : public GrGLLight {
 public:
+    virtual ~GrGLSpotLight() {}
     virtual void setupVariables(GrGLShaderBuilder* state, int stage);
     virtual void initUniforms(const GrGLInterface* gl, int programID);
     virtual void setData(const GrGLInterface* gl, const SkLight* light) const SK_OVERRIDE;
@@ -477,6 +481,15 @@
     virtual LightType type() const { return kDistant_LightType; }
     const SkPoint3& direction() const { return fDirection; }
     virtual GrGLLight* createGLLight() const SK_OVERRIDE;
+    virtual bool isEqual(const SkLight& other) const SK_OVERRIDE {
+        if (other.type() != kDistant_LightType) {
+            return false;
+        }
+
+        const SkDistantLight& o = static_cast<const SkDistantLight&>(other);
+        return INHERITED::isEqual(other) &&
+               fDirection == o.fDirection;
+    }
 
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDistantLight)
 
@@ -514,7 +527,7 @@
     virtual GrGLLight* createGLLight() const SK_OVERRIDE {
         return new GrGLPointLight();
     }
-    bool isEqual(const SkLight& other) const SK_OVERRIDE {
+    virtual bool isEqual(const SkLight& other) const SK_OVERRIDE {
         if (other.type() != kPoint_LightType) {
             return false;
         }