Move IOType to GrGpuRef and rename that to GrIORef. Template GrPendingIORef on IOType.

Move IOType to GrGpuRef and rename that to GrIORef. Template GrPendingIORef on IOType.

BUG=skia:2889
Committed: https://skia.googlesource.com/skia/+/45725db1d82615d43408ec488549aec6218f80e4

[bsalomon, 2014-09-18 21:12:52]

bsalomon@google.com changed reviewers:
+ robertphillips@google.com

[robertphillips, 2014-09-19 13:17:03]

lgtm but with something to consider.

https://codereview.chromium.org/579403003/diff/1/include/gpu/GrGpuResourceRef.h
File include/gpu/GrGpuResourceRef.h (right):

https://codereview.chromium.org/579403003/diff/1/include/gpu/GrGpuResourceRef...
include/gpu/GrGpuResourceRef.h:113: */
This seems very anti-templatey.

[bsalomon, 2014-09-19 13:32:58]

https://codereview.chromium.org/579403003/diff/1/include/gpu/GrGpuResourceRef.h
File include/gpu/GrGpuResourceRef.h (right):

https://codereview.chromium.org/579403003/diff/1/include/gpu/GrGpuResourceRef...
include/gpu/GrGpuResourceRef.h:113: */
On 2014/09/19 13:17:03, robertphillips wrote:
> This seems very anti-templatey.

Can you elaborate?

[bsalomon, 2014-09-19 13:39:41]

The CQ bit was checked by bsalomon@google.com

[commit-bot: I haz the power, 2014-09-19 13:40:47]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patchset/579403003/1

[commit-bot: I haz the power, 2014-09-19 13:40:50]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-09-19 13:40:51]

Failed to apply patch for include/gpu/GrGpuResource.h:
While running git apply --index -p1;
  error: patch failed: include/gpu/GrGpuResource.h:111
  error: include/gpu/GrGpuResource.h: patch does not apply

Patch:       include/gpu/GrGpuResource.h
Index: include/gpu/GrGpuResource.h
diff --git a/include/gpu/GrGpuResource.h b/include/gpu/GrGpuResource.h
index
32f4b9396a91b486417be4592adf69f93e57e510..f20bad3e9f57580ba416711a337bac071aada82c
100644
--- a/include/gpu/GrGpuResource.h
+++ b/include/gpu/GrGpuResource.h
@@ -33,11 +33,17 @@ class GrContext;
  *
  * The latter two ref types are private and intended only for Gr core code.
  */
-class GrGpuRef : public SkNoncopyable {
+class GrIORef : public SkNoncopyable {
 public:
-    SK_DECLARE_INST_COUNT_ROOT(GrGpuRef)
+    SK_DECLARE_INST_COUNT_ROOT(GrIORef)
 
-    virtual ~GrGpuRef();
+    enum IOType {
+        kRead_IOType,
+        kWrite_IOType,
+        kRW_IOType
+    };
+
+    virtual ~GrIORef();
 
     // Some of the signatures are written to mirror SkRefCnt so that
GrGpuResource can work with
     // templated helper classes (e.g. SkAutoTUnref). However, we have different
categories of
@@ -75,7 +81,7 @@ public:
     }
 
 protected:
-    GrGpuRef() : fRefCnt(1), fPendingReads(0), fPendingWrites(0) {}
+    GrIORef() : fRefCnt(1), fPendingReads(0), fPendingWrites(0) {}
 
 private:
     void addPendingRead() const {
@@ -111,13 +117,13 @@ private:
 
     // This class is used to manage conversion of refs to pending reads/writes.
     friend class GrGpuResourceRef;
-    template <typename T> friend class GrPendingIOResource;
+    template <typename, IOType> friend class GrPendingIOResource;
 };
 
 /**
  * Base class for objects that can be kept in the GrResourceCache.
  */
-class GrGpuResource : public GrGpuRef {
+class GrGpuResource : public GrIORef {
 public:
     SK_DECLARE_INST_COUNT(GrGpuResource)
 
@@ -242,7 +248,7 @@ private:
 
     GrResourceKey           fScratchKey;
 
-    typedef GrGpuRef INHERITED;
+    typedef GrIORef INHERITED;
 };
 
 #endif

[bsalomon, 2014-09-19 18:14:39]

The CQ bit was checked by bsalomon@google.com

[commit-bot: I haz the power, 2014-09-19 18:15:07]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/579403003/20001

[commit-bot: I haz the power, 2014-09-19 18:15:11]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-09-19 18:15:12]

Failed to apply patch for include/gpu/GrGpuResourceRef.h:
While running git apply --index -p1;
  error: patch failed: include/gpu/GrGpuResourceRef.h:166
  error: include/gpu/GrGpuResourceRef.h: patch does not apply

Patch:       include/gpu/GrGpuResourceRef.h
Index: include/gpu/GrGpuResourceRef.h
diff --git a/include/gpu/GrGpuResourceRef.h b/include/gpu/GrGpuResourceRef.h
index
6a72995a2194b76eca4029241496589ee6339962..6b3937b5c73066e393a5110327ec1512e633d12f
100644
--- a/include/gpu/GrGpuResourceRef.h
+++ b/include/gpu/GrGpuResourceRef.h
@@ -8,10 +8,9 @@
 #ifndef GrGpuResourceRef_DEFINED
 #define GrGpuResourceRef_DEFINED
 
+#include "GrGpuResource.h"
 #include "SkRefCnt.h"
 
-class GrGpuResource;
-
 /**
  * This class is intended only for internal use in core Gr code.
  *
@@ -37,14 +36,6 @@ class GrGpuResourceRef : SkNoncopyable {
 public:
     SK_DECLARE_INST_COUNT_ROOT(GrGpuResourceRef);
 
-    enum IOType {
-        kRead_IOType,
-        kWrite_IOType,
-        kRW_IOType,
-
-        kNone_IOType, // For internal use only, don't specify to constructor or
setResource().
-    };
-
     ~GrGpuResourceRef();
 
     GrGpuResource* getResource() const { return fResource; }
@@ -61,11 +52,11 @@ protected:
 
     /** Adopts a ref from the caller. ioType expresses what type of IO
operations will be marked as
         pending on the resource when markPendingIO is called. */
-    GrGpuResourceRef(GrGpuResource*, IOType);
+    GrGpuResourceRef(GrGpuResource*, GrIORef::IOType);
 
     /** Adopts a ref from the caller. ioType expresses what type of IO
operations will be marked as
         pending on the resource when markPendingIO is called. */
-    void setResource(GrGpuResource*, IOType);
+    void setResource(GrGpuResource*, GrIORef::IOType);
 
 private:
     /** Called by owning GrProgramElement when the program element is first
scheduled for
@@ -90,7 +81,7 @@ private:
     GrGpuResource*      fResource;
     mutable bool        fOwnRef;
     mutable bool        fPendingIO;
-    IOType              fIOType;
+    GrIORef::IOType     fIOType;
 
     typedef SkNoncopyable INHERITED;
 };
@@ -104,13 +95,13 @@ public:
 
     /** Adopts a ref from the caller. ioType expresses what type of IO
operations will be marked as
         pending on the resource when markPendingIO is called. */
-    GrTGpuResourceRef(T* resource, IOType ioType) : INHERITED(resource, ioType)
{}
+    GrTGpuResourceRef(T* resource, GrIORef::IOType ioType) :
INHERITED(resource, ioType) {}
 
     T* get() const { return static_cast<T*>(this->getResource()); }
 
     /** Adopts a ref from the caller. ioType expresses what type of IO
operations will be marked as
         pending on the resource when markPendingIO is called. */
-    void set(T* resource, IOType ioType) { this->setResource(resource, ioType);
}
+    void set(T* resource, GrIORef::IOType ioType) { this->setResource(resource,
ioType); }
 
 private:
     typedef GrGpuResourceRef INHERITED;
@@ -120,22 +111,18 @@ private:
  * This is similar to GrTGpuResourceRef but can only be in the pending IO
state. It never owns a
  * ref.
  */
-template <typename T> class GrPendingIOResource : SkNoncopyable {
+template <typename T, GrIORef::IOType IO_TYPE> class GrPendingIOResource :
SkNoncopyable {
 public:
-    typedef GrGpuResourceRef::IOType IOType;
-    GrPendingIOResource(T* resource, IOType ioType) : fResource(resource),
fIOType(ioType) {
+    GrPendingIOResource(T* resource) : fResource(resource) {
         if (NULL != fResource) {
-            switch (fIOType) {
-                case GrGpuResourceRef::kNone_IOType:
-                    SkFAIL("GrPendingIOResource with neither reads nor
writes?");
-                    break;
-                case GrGpuResourceRef::kRead_IOType:
+            switch (IO_TYPE) {
+                case GrIORef::kRead_IOType:
                     fResource->addPendingRead();
                     break;
-                case GrGpuResourceRef::kWrite_IOType:
+                case GrIORef::kWrite_IOType:
                     fResource->addPendingWrite();
                     break;
-                case GrGpuResourceRef::kRW_IOType:
+                case GrIORef::kRW_IOType:
                     fResource->addPendingRead();
                     fResource->addPendingWrite();
                     break;
@@ -145,17 +132,14 @@ public:
 
     ~GrPendingIOResource() {
         if (NULL != fResource) {
-            switch (fIOType) {
-                case GrGpuResourceRef::kNone_IOType:
-                    SkFAIL("GrPendingIOResource with neither reads nor
writes?");
-                    break;
-                case GrGpuResourceRef::kRead_IOType:
+            switch (IO_TYPE) {
+                case GrIORef::kRead_IOType:
                     fResource->completedRead();
                     break;
-                case GrGpuResourceRef::kWrite_IOType:
+                case GrIORef::kWrite_IOType:
                     fResource->completedWrite();
                     break;
-                case GrGpuResourceRef::kRW_IOType:
+                case GrIORef::kRW_IOType:
                     fResource->completedRead();
                     fResource->completedWrite();
                     break;
@@ -166,7 +150,6 @@ public:
     T* get() const { return fResource; }
 
 private:
-    IOType  fIOType;
     T*      fResource;
 };
 #endif

[bsalomon, 2014-09-19 18:33:48]

The CQ bit was checked by bsalomon@google.com

[commit-bot: I haz the power, 2014-09-19 18:34:06]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/579403003/40001

[commit-bot: I haz the power, 2014-09-19 18:48:06]

Committed patchset #3 (id:40001) as 45725db1d82615d43408ec488549aec6218f80e4