Split GrDrawState and GrOptDrawState into separate classes and remove base class.

include/gpu/GrGpuResourceRef.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGpuResourceRef_DEFINED
 #define GrGpuResourceRef_DEFINED
 
@@ skipping 57 matching lines @@
         writes to the resource using the program element or draw state. It can only be called once.
       */
     void removeRef() const;
 
     /** Called to indicate that the previous pending IO is complete. Useful when the owning object
         still has refs, so it is not about to destroy this GrGpuResourceRef, but its previously
         pending executions have been complete. Can only be called if removeRef() was not previously
         called. */
     void pendingIOComplete() const;
 
-    friend class GrRODrawState;
+    friend class GrDrawState;
+    friend class GrOptDrawState;
     friend class GrProgramElement;
 
     GrGpuResource*      fResource;
     mutable bool        fOwnRef;
     mutable bool        fPendingIO;
     GrIORef::IOType     fIOType;
 
     typedef SkNoncopyable INHERITED;
 };
 
@@ skipping 57 matching lines @@
             }
         }
     }
 
     T* get() const { return fResource; }
 
 private:
     T*      fResource;
 };
 #endif