Revert 171403

cc/layer_tree_host.h

Index: cc/layer_tree_host.h
===================================================================
--- cc/layer_tree_host.h	(revision 171405)
+++ cc/layer_tree_host.h	(working copy)
@@ -15,10 +15,10 @@
 #include "base/time.h"
 #include "cc/animation_events.h"
 #include "cc/cc_export.h"
+#include "cc/graphics_context.h"
 #include "cc/layer_tree_host_client.h"
 #include "cc/layer_tree_host_common.h"
 #include "cc/occlusion_tracker.h"
-#include "cc/output_surface.h"
 #include "cc/prioritized_resource_manager.h"
 #include "cc/proxy.h"
 #include "cc/rate_limiter.h"
@@ -102,6 +102,7 @@
     ~RendererCapabilities();
 
     GLenum bestTextureFormat;
+    bool contextHasCachedFrontBuffer;
     bool usingPartialSwap;
     bool usingAcceleratedPainting;
     bool usingSetVisibility;
@@ -136,16 +137,16 @@
     void finishCommitOnImplThread(LayerTreeHostImpl*);
     void willCommit();
     void commitComplete();
-    scoped_ptr<OutputSurface> createOutputSurface();
+    scoped_ptr<GraphicsContext> createContext();
     scoped_ptr<InputHandler> createInputHandler();
     virtual scoped_ptr<LayerTreeHostImpl> createLayerTreeHostImpl(LayerTreeHostImplClient*);
-    void didLoseOutputSurface();
+    void didLoseContext();
     enum RecreateResult {
         RecreateSucceeded,
         RecreateFailedButTryAgain,
         RecreateFailedAndGaveUp,
     };
-    RecreateResult recreateOutputSurface();
+    RecreateResult recreateContext();
     void didCommitAndDrawFrame() { m_client->didCommitAndDrawFrame(); }
     void didCompleteSwapBuffers() { m_client->didCompleteSwapBuffers(); }
     void deleteContentsTexturesOnImplThread(ResourceProvider*);
@@ -180,7 +181,7 @@
     const RendererCapabilities& rendererCapabilities() const;
 
     // Test only hook
-    void loseOutputSurface(int numTimes);
+    void loseContext(int numTimes);
 
     void setNeedsAnimate();
     // virtual for testing
@@ -283,7 +284,7 @@
     RenderingStats m_renderingStats;
 
     bool m_rendererInitialized;
-    bool m_outputSurfaceLost;
+    bool m_contextLost;
     int m_numTimesRecreateShouldFail;
     int m_numFailedRecreateAttempts;