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

src/gpu/GrDrawTarget.h

Index: src/gpu/GrDrawTarget.h
diff --git a/src/gpu/GrDrawTarget.h b/src/gpu/GrDrawTarget.h
index 8ffc68162799d6d45701f4661763058da2bd4a44..dd2224bdbdd49f8cd5f5dde6ee331245a512cc68 100644
--- a/src/gpu/GrDrawTarget.h
+++ b/src/gpu/GrDrawTarget.h
@@ -694,8 +694,8 @@ public:
     virtual DrawToken getCurrentDrawToken() { return DrawToken(this, 0); }
 
 protected:
-    // Extend access to GrRODrawState::convertToPEndeingExec to subclasses.
-    void convertDrawStateToPendingExec(GrRODrawState* ds) {
+    // Extend access to GrDrawState::convertToPEndeingExec to subclasses.
+    void convertDrawStateToPendingExec(GrDrawState* ds) {
         ds->convertToPendingExec();
     }