Revert of Add option to draw wireframe batch bounds

dm/DMGpuSupport.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 DMGpuSupport_DEFINED
 #define DMGpuSupport_DEFINED
 
 // Provides Ganesh to DM,
 // or if it's not available, fakes it enough so most code doesn't have to know that.
 
 #include "SkSurface.h"
 
-// This should be safe to include even in no-gpu builds. Include by relative path so it
-// can be found in non-gpu builds.
-#include "../include/gpu/GrContextOptions.h"
-
 #if SK_SUPPORT_GPU
 
 // Ganesh is available.  Yippee!
 
 #  include "GrContext.h"
 #  include "GrContextFactory.h"
 
 namespace DM {
 
 static const bool kGPUDisabled = false;
@@ skipping 22 matching lines @@
     kGLES_GrGLStandard
 };
 static const int kGrGLStandardCnt = 3;
 
 class GrContext {
 public:
     void dumpCacheStats(SkString*) const {}
     void dumpGpuStats(SkString*) const {}
 };
 
+struct GrContextOptions {
+    bool fImmediateMode;
+    bool fClipBatchToBounds;
+};
+
 class GrContextFactory {
 public:
     GrContextFactory() {};
     explicit GrContextFactory(const GrContextOptions&) {}
 
     typedef int GLContextType;
 
     static const GLContextType kANGLE_GLContextType         = 0,
                                kANGLE_GL_GLContextType      = 0,
                                kCommandBuffer_GLContextType = 0,
@@ skipping 19 matching lines @@
                                        int,
                                        bool) {
     return nullptr;
 }
 
 }  // namespace DM
 
 #endif//SK_SUPPORT_GPU
 
 #endif//DMGpuSupport_DEFINED