Revert of Begin instanced rendering for simple shapes

src/gpu/GrDrawingManager.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrDrawContext.h"
 #include "GrDrawingManager.h"
 #include "GrDrawTarget.h"
 #include "GrPathRenderingDrawContext.h"
 #include "GrResourceProvider.h"
 #include "GrSoftwarePathRenderer.h"
 #include "SkTTopoSort.h"
 
-#include "instanced/InstancedRendering.h"
-
 #include "text/GrAtlasTextContext.h"
 #include "text/GrStencilAndCoverTextContext.h"
 
-using gr_instanced::InstancedRendering;
-
 void GrDrawingManager::cleanup() {
     for (int i = 0; i < fDrawTargets.count(); ++i) {
         fDrawTargets[i]->makeClosed();  // no drawTarget should receive a new command after this
         fDrawTargets[i]->clearRT();
 
         // We shouldn't need to do this, but it turns out some clients still hold onto drawtargets
         // after a cleanup
         fDrawTargets[i]->reset();
         fDrawTargets[i]->unref();
     }
 
     fDrawTargets.reset();
 
     delete fPathRendererChain;
     fPathRendererChain = nullptr;
     SkSafeSetNull(fSoftwarePathRenderer);
 }
 
 GrDrawingManager::~GrDrawingManager() {
     this->cleanup();
 }
 
 void GrDrawingManager::abandon() {
     fAbandoned = true;
-    for (int i = 0; i < fDrawTargets.count(); ++i) {
-        if (InstancedRendering* ir = fDrawTargets[i]->instancedRendering()) {
-            ir->resetGpuResources(InstancedRendering::ResetType::kAbandon);
-        }
-    }
     this->cleanup();
 }
 
 void GrDrawingManager::freeGpuResources() {
     // a path renderer may be holding onto resources
     delete fPathRendererChain;
     fPathRendererChain = nullptr;
     SkSafeSetNull(fSoftwarePathRenderer);
-    for (int i = 0; i < fDrawTargets.count(); ++i) {
-        if (InstancedRendering* ir = fDrawTargets[i]->instancedRendering()) {
-            ir->resetGpuResources(InstancedRendering::ResetType::kDestroy);
-        }
-    }
 }
 
 void GrDrawingManager::reset() {
     for (int i = 0; i < fDrawTargets.count(); ++i) {
         fDrawTargets[i]->reset();
     }
     fFlushState.reset();
 }
 
 void GrDrawingManager::flush() {
@@ skipping 119 matching lines @@
                                                         fContext, this, std::move(rt), 
                                                         surfaceProps,
                                                         fContext->getAuditTrail(), fSingleOwner));
         }
     }
 
     return sk_sp<GrDrawContext>(new GrDrawContext(fContext, this, std::move(rt), surfaceProps,
                                                   fContext->getAuditTrail(),
                                                   fSingleOwner));
 }