From 5990397d08640a80a7ccb3955b9952b356be3f86 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Thu, 7 Feb 2013 21:02:23 +0000 Subject: [PATCH] Address google3 compiler warning https://codereview.appspot.com/7308063/ git-svn-id: http://skia.googlecode.com/svn/trunk@7655 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench/DeferredCanvasBench.cpp | 2 ++ include/utils/SkDeferredCanvas.h | 5 ++--- tests/DeferredCanvasTest.cpp | 3 +++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/bench/DeferredCanvasBench.cpp b/bench/DeferredCanvasBench.cpp index a1a3901..98a1e60 100644 --- a/bench/DeferredCanvasBench.cpp +++ b/bench/DeferredCanvasBench.cpp @@ -63,6 +63,8 @@ public: virtual void flushedDrawCommands() SK_OVERRIDE {fDummy = !fDummy;} private: bool fDummy; + + typedef SkDeferredCanvas::NotificationClient INHERITED; }; // Test that records very simple draw operations. diff --git a/include/utils/SkDeferredCanvas.h b/include/utils/SkDeferredCanvas.h index 716ec3e..53bea82 100644 --- a/include/utils/SkDeferredCanvas.h +++ b/include/utils/SkDeferredCanvas.h @@ -192,6 +192,8 @@ public: public: class NotificationClient { public: + virtual ~NotificationClient() {} + /** * Called before executing one or several draw commands, which means * once per flush when deferred rendering is enabled. @@ -218,9 +220,6 @@ public: * or completely overwritten by the command currently being recorded. */ virtual void skippedPendingDrawCommands() {} - - private: - typedef SkRefCnt INHERITED; }; protected: diff --git a/tests/DeferredCanvasTest.cpp b/tests/DeferredCanvasTest.cpp index 8a834be..a052c2e 100644 --- a/tests/DeferredCanvasTest.cpp +++ b/tests/DeferredCanvasTest.cpp @@ -260,6 +260,9 @@ public: int fStorageAllocatedChangedCount; int fFlushedDrawCommandsCount; int fSkippedPendingDrawCommandsCount; + +private: + typedef SkDeferredCanvas::NotificationClient INHERITED; }; static void TestDeferredCanvasBitmapCaching(skiatest::Reporter* reporter) { -- 2.7.4