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

cc/resource_provider.h

Index: cc/resource_provider.h
diff --git a/cc/resource_provider.h b/cc/resource_provider.h
index e90c1f2e9640f4d17e6158e364bc544eebc45ada..db42017da47ad363b9185398feabcb871a790996 100644
--- a/cc/resource_provider.h
+++ b/cc/resource_provider.h
@@ -6,8 +6,8 @@
 #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"
@@ -44,11 +44,11 @@ public:
         Bitmap,
     };
     struct Mailbox {
-        GC3Dbyte name[64];
+        GLbyte name[64];
     };
     struct TransferableResource {
         unsigned id;
-        GC3Denum format;
+        GLenum format;
         IntSize size;
         Mailbox mailbox;
     };
@@ -82,10 +82,10 @@ public:
     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);
@@ -213,8 +213,8 @@ public:
 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;
@@ -225,7 +225,7 @@ private:
         bool exported;
         bool markedForDeletion;
         IntSize size;
-        GC3Denum format;
+        GLenum format;
         ResourceType type;
     };
     typedef HashMap<ResourceId, Resource> ResourceMap;