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
diff --git a/tools/skpdiff/SkPMetric.h b/tools/skpdiff/SkPMetric.h
index 5963c2f..b60858a 100644
--- a/tools/skpdiff/SkPMetric.h
+++ b/tools/skpdiff/SkPMetric.h
@@ -18,23 +18,11 @@
*/
class SkPMetric : public SkImageDiffer {
public:
- virtual const char* getName() 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 const char* getName() const SK_OVERRIDE { return "perceptual"; }
+ virtual bool diff(SkBitmap* baseline, SkBitmap* test, bool computeMask,
+ Result* result) const SK_OVERRIDE;
private:
- struct QueuedDiff {
- bool finished;
- double result;
- SkTDArray<SkIPoint> poi;
- };
-
- SkTArray<QueuedDiff> fQueuedDiffs;
-
typedef SkImageDiffer INHERITED;
};