Revert 171403

cc/single_thread_proxy.h

Index: cc/single_thread_proxy.h
===================================================================
--- cc/single_thread_proxy.h	(revision 171405)
+++ cc/single_thread_proxy.h	(working copy)
@@ -26,14 +26,14 @@
     virtual void startPageScaleAnimation(gfx::Vector2d targetOffset, bool useAnchor, float scale, base::TimeDelta duration) OVERRIDE;
     virtual void finishAllRendering() OVERRIDE;
     virtual bool isStarted() const OVERRIDE;
-    virtual bool initializeOutputSurface() OVERRIDE;
+    virtual bool initializeContext() OVERRIDE;
     virtual void setSurfaceReady() OVERRIDE;
     virtual void setVisible(bool) OVERRIDE;
     virtual bool initializeRenderer() OVERRIDE;
-    virtual bool recreateOutputSurface() OVERRIDE;
+    virtual bool recreateContext() OVERRIDE;
     virtual void renderingStats(RenderingStats*) OVERRIDE;
     virtual const RendererCapabilities& rendererCapabilities() const OVERRIDE;
-    virtual void loseOutputSurface() OVERRIDE;
+    virtual void loseContext() OVERRIDE;
     virtual void setNeedsAnimate() OVERRIDE;
     virtual void setNeedsCommit() OVERRIDE;
     virtual void setNeedsRedraw() OVERRIDE;
@@ -47,7 +47,7 @@
     virtual void forceSerializeOnSwapBuffers() OVERRIDE;
 
     // LayerTreeHostImplClient implementation
-    virtual void didLoseOutputSurfaceOnImplThread() OVERRIDE { }
+    virtual void didLoseContextOnImplThread() OVERRIDE { }
     virtual void onSwapBuffersCompleteOnImplThread() OVERRIDE;
     virtual void onVSyncParametersChanged(base::TimeTicks timebase, base::TimeDelta interval) OVERRIDE { }
     virtual void onCanDrawStateChanged(bool canDraw) OVERRIDE { }
@@ -71,11 +71,11 @@
 
     // Accessed on main thread only.
     LayerTreeHost* m_layerTreeHost;
-    bool m_outputSurfaceLost;
+    bool m_contextLost;
 
     // Holds on to the context between initializeContext() and initializeRenderer() calls. Shouldn't
     // be used for anything else.
-    scoped_ptr<OutputSurface> m_outputSurfaceBeforeInitialization;
+    scoped_ptr<GraphicsContext> m_contextBeforeInitialization;
 
     // Used on the Thread, but checked on main thread during initialization/shutdown.
     scoped_ptr<LayerTreeHostImpl> m_layerTreeHostImpl;