remove legacy Gr things

Review URL: https://codereview.chromium.org/1132813002

diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h
index 24b1d51..77aef60 100644 (file)
--- a/include/gpu/GrContext.h
+++ b/include/gpu/GrContext.h
@@ -518,23 +518,6 @@ public:
     uint32_t uniqueID() { return fUniqueID; }
 
     ///////////////////////////////////////////////////////////////////////////
-    // Legacy functions, to be removed once Chromium stops using them.
-
-    enum ScratchTexMatch {
-        kExact_ScratchTexMatch = GrTextureProvider::kExact_ScratchTexMatch,
-        kApprox_ScratchTexMatch = GrTextureProvider::kApprox_ScratchTexMatch
-    };
-
-    GrTexture* refScratchTexture(const GrSurfaceDesc& desc, ScratchTexMatch match) {
-        return this->textureProvider()->refScratchTexture(
-            desc, (GrTextureProvider::ScratchTexMatch) match);
-    }
-
-    GrTexture* wrapBackendTexture(const GrBackendTextureDesc& desc) {
-        return this->textureProvider()->wrapBackendTexture(desc);
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
     // Functions intended for internal use only.
     GrGpu* getGpu() { return fGpu; }
     const GrGpu* getGpu() const { return fGpu; }

diff --git a/include/gpu/GrTypes.h b/include/gpu/GrTypes.h
index 3f02c62..fceae19 100644 (file)
--- a/include/gpu/GrTypes.h
+++ b/include/gpu/GrTypes.h
@@ -390,10 +390,6 @@ enum GrSurfaceFlags {
      */
     kRenderTarget_GrSurfaceFlag     = 0x1,
     /**
-     * DEPRECATED. This has no effect.
-     */
-    kNoStencil_GrSurfaceFlag        = 0x2,
-    /**
      * Indicates that all allocations (color buffer, FBO completeness, etc)
      * should be verified.
      */
@@ -402,13 +398,6 @@ enum GrSurfaceFlags {
 
 GR_MAKE_BITFIELD_OPS(GrSurfaceFlags)
 
-// Legacy aliases
-typedef GrSurfaceFlags GrTextureFlags;
-static const GrSurfaceFlags kNone_GrTextureFlags = kNone_GrSurfaceFlags;
-static const GrSurfaceFlags kRenderTarget_GrTextureFlagBit = kRenderTarget_GrSurfaceFlag;
-static const GrSurfaceFlags kNoStencil_GrTextureFlagBit = kNoStencil_GrSurfaceFlag;
-static const GrSurfaceFlags kCheckAllocation_GrTextureFlagBit = kCheckAllocation_GrSurfaceFlag;
-
 /**
  * Some textures will be stored such that the upper and left edges of the content meet at the
  * the origin (in texture coord space) and for other textures the lower and left edges meet at