Revert 171403

cc/layer_tree_host.h

 // Copyright 2011 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 CC_LAYER_TREE_HOST_H_
 #define CC_LAYER_TREE_HOST_H_
 
 #include <limits>
 
 #include "base/basictypes.h"
 #include "base/cancelable_callback.h"
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #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"
 #include "cc/rendering_stats.h"
 #include "cc/scoped_ptr_vector.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/rect.h"
 
 #if defined(COMPILER_GCC)
 namespace BASE_HASH_NAMESPACE {
@@ skipping 63 matching lines @@
 
     LayerTreeDebugState initialDebugState;
 };
 
 // Provides information on an Impl's rendering capabilities back to the LayerTreeHost
 struct CC_EXPORT RendererCapabilities {
     RendererCapabilities();
     ~RendererCapabilities();
 
     GLenum bestTextureFormat;
+    bool contextHasCachedFrontBuffer;
     bool usingPartialSwap;
     bool usingAcceleratedPainting;
     bool usingSetVisibility;
     bool usingSwapCompleteCallback;
     bool usingGpuMemoryManager;
     bool usingDiscardFramebuffer;
     bool usingEglImage;
     bool allowPartialTextureUpdates;
     int maxTextureSize;
 };
@@ skipping 14 matching lines @@
 
     // LayerTreeHost interface to Proxy.
     void willBeginFrame() { m_client->willBeginFrame(); }
     void didBeginFrame() { m_client->didBeginFrame(); }
     void updateAnimations(base::TimeTicks monotonicFrameBeginTime);
     void layout();
     void beginCommitOnImplThread(LayerTreeHostImpl*);
     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*);
     virtual void acquireLayerTextures();
     // Returns false if we should abort this frame due to initialization failure.
     bool initializeRendererIfNeeded();
     void updateLayers(ResourceUpdateQueue&, size_t contentsMemoryLimitBytes);
 
     LayerTreeHostClient* client() { return m_client; }
 
@@ skipping 14 matching lines @@
     // Test only hook
     virtual void didDeferCommit();
 
     int commitNumber() const { return m_commitNumber; }
 
     void renderingStats(RenderingStats*) const;
 
     const RendererCapabilities& rendererCapabilities() const;
 
     // Test only hook
-    void loseOutputSurface(int numTimes);
+    void loseContext(int numTimes);
 
     void setNeedsAnimate();
     // virtual for testing
     virtual void setNeedsCommit();
     virtual void setNeedsFullTreeSync();
     void setNeedsRedraw();
     bool commitRequested() const;
 
     void setAnimationEvents(scoped_ptr<AnimationEventsVector>, base::Time wallClockTime);
     virtual void didAddAnimation();
@@ skipping 82 matching lines @@
 
     base::CancelableClosure m_prepaintCallback;
 
     LayerTreeHostClient* m_client;
     scoped_ptr<Proxy> m_proxy;
 
     int m_commitNumber;
     RenderingStats m_renderingStats;
 
     bool m_rendererInitialized;
-    bool m_outputSurfaceLost;
+    bool m_contextLost;
     int m_numTimesRecreateShouldFail;
     int m_numFailedRecreateAttempts;
 
     scoped_refptr<Layer> m_rootLayer;
     scoped_refptr<HeadsUpDisplayLayer> m_hudLayer;
 
     scoped_ptr<PrioritizedResourceManager> m_contentsTextureManager;
     scoped_ptr<PrioritizedResource> m_surfaceMemoryPlaceholder;
 
     LayerTreeSettings m_settings;
@@ skipping 20 matching lines @@
     size_t m_partialTextureUpdateRequests;
 
     static bool s_needsFilterContext;
 
     DISALLOW_COPY_AND_ASSIGN(LayerTreeHost);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYER_TREE_HOST_H_