commit bc4c96bc65ab6ee0acc62d5d8a6613156991ac6c
author Mike Klein <mtklein@chromium.org> Wed May 03 15:55:10 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed May 03 20:49:55 2017 +0000
tree 253d34ae858e4f413b00d717643621ba3dbb32a5
parent 69b1045ce2b70e88db4f809b6e4140ca92600c82

fix G3 opt android_arm build?

We suspect that having SkTDPQueue inherit from SkNoncopyable is
what's causing this error:

third_party/skia/HEAD/src/gpu/GrResourceCache.h:44:7: error: 'GrResourceCache' declared with greater visibility than the type of its field 'GrResourceCache::fPurgeableQueue' [-Werror=attributes]
 class GrResourceCache {
       ^

Change-Id: Idc737aa64f5cb159edbe59e8baf70d711f7e07d9
Reviewed-on: https://skia-review.googlesource.com/15243
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>

src/core/SkTDPQueue.h

diff --git a/src/core/SkTDPQueue.h b/src/core/SkTDPQueue.h
index 294c9f4..b5c9923 100644
--- a/src/core/SkTDPQueue.h
+++ b/src/core/SkTDPQueue.h
@@ -24,10 +24,16 @@
 template <typename T,
           bool (*LESS)(const T&, const T&),
           int* (*INDEX)(const T&) = (int* (*)(const T&))nullptr>
-class SkTDPQueue : public SkNoncopyable {
+class SkTDPQueue {
 public:
     SkTDPQueue() {}
 
+    SkTDPQueue(SkTDPQueue&&) = default;
+    SkTDPQueue& operator =(SkTDPQueue&&) = default;
+
+    SkTDPQueue(const SkTDPQueue&) = delete;
+    SkTDPQueue& operator=(const SkTDPQueue&) = delete;
+
     /** Number of items in the queue. */
     int count() const { return fArray.count(); }
 
@@ -188,8 +194,6 @@
     }
 
     SkTDArray<T> fArray;
-
-    typedef SkNoncopyable INHERITED;
 };
 
 #endif