cc: Finish the rename from cc::GraphicsContext to cc::OutputSurface

It is far too confusing to deal with OutputSurface code when half the time it is
called a GraphicsContext incorrectly. Cleaning this up so I can think about the
code properly as I upstream the Ubercomp CL.

R=jamesr,piman
BUG=146080

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=171403

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171410 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 4 deletions

diff --git a/cc/resource_provider.h b/cc/resource_provider.h
index ba68863..0bbcaf8 100644
--- a/cc/resource_provider.h
+++ b/cc/resource_provider.h
@@ -10,7 +10,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "cc/cc_export.h"
-#include "cc/graphics_context.h"
+#include "cc/output_surface.h"
 #include "cc/texture_copier.h"
 #include "cc/transferable_resource.h"
 #include "third_party/khronos/GLES2/gl2.h"
@@ -46,7 +46,7 @@ public:
         Bitmap,
     };
 
-    static scoped_ptr<ResourceProvider> create(GraphicsContext*);
+    static scoped_ptr<ResourceProvider> create(OutputSurface*);
 
     virtual ~ResourceProvider();
 
@@ -257,7 +257,7 @@ private:
     };
     typedef base::hash_map<int, Child> ChildMap;
 
-    explicit ResourceProvider(GraphicsContext*);
+    explicit ResourceProvider(OutputSurface*);
     bool initialize();
 
     const Resource* lockForRead(ResourceId);
@@ -269,7 +269,7 @@ private:
     bool transferResource(WebKit::WebGraphicsContext3D*, ResourceId, TransferableResource*);
     void deleteResourceInternal(ResourceMap::iterator it);
 
-    GraphicsContext* m_context;
+    OutputSurface* m_outputSurface;
     ResourceId m_nextId;
     ResourceMap m_resources;
     int m_nextChild;