commit efc51b79a22348e3c2596e872609a7a4b018e531
author djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Nov 12 18:29:17 2013 +0000
committer djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Nov 12 18:29:17 2013 +0000
tree 7e41003a78f33d6d663ca5decbd33aace584fe60
parent 21a0b10d7c28e2ca123ddbe32fd8388687b3ef2c

fix multithread related crashes in skpdiff

BUG=skia:1798
R=mtklein@google.com, scroggo@google.com

Review URL: https://codereview.chromium.org/60833002

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

tools/skpdiff/SkDifferentPixelsMetric.h

diff --git a/tools/skpdiff/SkDifferentPixelsMetric.h b/tools/skpdiff/SkDifferentPixelsMetric.h
index 614f920..06c56b1 100644
--- a/tools/skpdiff/SkDifferentPixelsMetric.h
+++ b/tools/skpdiff/SkDifferentPixelsMetric.h
@@ -27,17 +27,9 @@
     public SkImageDiffer {
 #endif
 public:
-    SkDifferentPixelsMetric() : fPOIAlphaMask(false) {}
-
-    virtual const char* getName() SK_OVERRIDE;
-    virtual bool enablePOIAlphaMask() SK_OVERRIDE;
-    virtual int queueDiff(SkBitmap* baseline, SkBitmap* test) SK_OVERRIDE;
-    virtual void deleteDiff(int id) SK_OVERRIDE;
-    virtual bool isFinished(int id) SK_OVERRIDE;
-    virtual double getResult(int id) SK_OVERRIDE;
-    virtual int getPointsOfInterestCount(int id) SK_OVERRIDE;
-    virtual SkIPoint* getPointsOfInterest(int id) SK_OVERRIDE;
-    virtual SkBitmap* getPointsOfInterestAlphaMask(int id) SK_OVERRIDE;
+    virtual const char* getName() const SK_OVERRIDE;
+    virtual bool diff(SkBitmap* baseline, SkBitmap* test, bool computeMask,
+                      Result* result) const SK_OVERRIDE;
 
 protected:
 #if SK_SUPPORT_OPENCL
@@ -45,11 +37,6 @@
 #endif
 
 private:
-    bool fPOIAlphaMask;
-
-    struct QueuedDiff;
-    SkTDArray<QueuedDiff> fQueuedDiffs;
-
 #if SK_SUPPORT_OPENCL
     cl_kernel fKernel;