Patch from https://codereview.chromium.org/11111005/ without actual file deletes

cc/resource_provider.h

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CCResourceProvider_h
 #define CCResourceProvider_h
 
 #include "base/basictypes.h"
+#include "third_party/khronos/GLES2/gl2.h"
 #include "CCGraphicsContext.h"
-#include "GraphicsContext3D.h"
 #include "IntSize.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "TextureCopier.h"
 #include <wtf/Deque.h>
 #include <wtf/HashMap.h>
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefPtr.h>
@@ skipping 16 matching lines @@
 public:
     typedef unsigned ResourceId;
     typedef Vector<ResourceId> ResourceIdArray;
     typedef HashMap<ResourceId, ResourceId> ResourceIdMap;
     enum TextureUsageHint { TextureUsageAny, TextureUsageFramebuffer };
     enum ResourceType {
         GLTexture = 1,
         Bitmap,
     };
     struct Mailbox {
-        GC3Dbyte name[64];
+        GLbyte name[64];
     };
     struct TransferableResource {
         unsigned id;
-        GC3Denum format;
+        GLenum format;
         IntSize size;
         Mailbox mailbox;
     };
     typedef Vector<TransferableResource> TransferableResourceArray;
     struct TransferableResourceList {
         TransferableResourceList();
         ~TransferableResourceList();
 
         TransferableResourceArray resources;
         unsigned syncPoint;
@@ skipping 13 matching lines @@
     bool inUseByConsumer(ResourceId);
 
 
     // Producer interface.
 
     void setDefaultResourceType(ResourceType type) { m_defaultResourceType = type; }
     ResourceType defaultResourceType() const { return m_defaultResourceType; }
     ResourceType resourceType(ResourceId);
 
     // Creates a resource of the default resource type.
-    ResourceId createResource(int pool, const IntSize&, GC3Denum format, TextureUsageHint);
+    ResourceId createResource(int pool, const IntSize&, GLenum format, TextureUsageHint);
 
     // You can also explicitly create a specific resource type.
-    ResourceId createGLTexture(int pool, const IntSize&, GC3Denum format, TextureUsageHint);
+    ResourceId createGLTexture(int pool, const IntSize&, GLenum format, TextureUsageHint);
     ResourceId createBitmap(int pool, const IntSize&);
     // Wraps an external texture into a GL resource.
     ResourceId createResourceFromExternalTexture(unsigned textureId);
 
     void deleteResource(ResourceId);
 
     // Deletes all resources owned by a given pool.
     void deleteOwnedResources(int pool);
 
     // Upload data from image, copying sourceRect (in image) into destRect (in the resource).
@@ skipping 107 matching lines @@
         CCResourceProvider::ResourceId m_resourceId;
         SkBitmap m_skBitmap;
         OwnPtr<SkCanvas> m_skCanvas;
 
         DISALLOW_COPY_AND_ASSIGN(ScopedWriteLockSoftware);
     };
 
 private:
     struct Resource {
         Resource();
-        Resource(unsigned textureId, int pool, const IntSize& size, GC3Denum format);
-        Resource(uint8_t* pixels, int pool, const IntSize& size, GC3Denum format);
+        Resource(unsigned textureId, int pool, const IntSize& size, GLenum format);
+        Resource(uint8_t* pixels, int pool, const IntSize& size, GLenum format);
 
         unsigned glId;
         uint8_t* pixels;
         int pool;
         int lockForReadCount;
         bool lockedForWrite;
         bool external;
         bool exported;
         bool markedForDeletion;
         IntSize size;
-        GC3Denum format;
+        GLenum format;
         ResourceType type;
     };
     typedef HashMap<ResourceId, Resource> ResourceMap;
     struct Child {
         Child();
         ~Child();
 
         int pool;
         ResourceIdMap childToParentMap;
         ResourceIdMap parentToChildMap;
@@ skipping 29 matching lines @@
     OwnPtr<TextureUploader> m_textureUploader;
     OwnPtr<AcceleratedTextureCopier> m_textureCopier;
     int m_maxTextureSize;
 
     DISALLOW_COPY_AND_ASSIGN(CCResourceProvider);
 };
 
 }
 
 #endif