Revert 171403

cc/scheduler_state_machine.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_SCHEDULER_STATE_MACHINE_H_
 #define CC_SCHEDULER_STATE_MACHINE_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 21 matching lines @@
         COMMIT_STATE_READY_TO_COMMIT,
         COMMIT_STATE_WAITING_FOR_FIRST_DRAW,
     };
 
     enum TextureState {
         LAYER_TEXTURE_STATE_UNLOCKED,
         LAYER_TEXTURE_STATE_ACQUIRED_BY_MAIN_THREAD,
         LAYER_TEXTURE_STATE_ACQUIRED_BY_IMPL_THREAD,
     };
 
-    enum OutputSurfaceState {
-        OUTPUT_SURFACE_ACTIVE,
-        OUTPUT_SURFACE_LOST,
-        OUTPUT_SURFACE_RECREATING,
+    enum ContextState {
+        CONTEXT_ACTIVE,
+        CONTEXT_LOST,
+        CONTEXT_RECREATING,
     };
 
     bool commitPending() const
     {
         return m_commitState != COMMIT_STATE_IDLE;
     }
 
     bool redrawPending() const { return m_needsRedraw; }
 
     enum Action {
         ACTION_NONE,
         ACTION_BEGIN_FRAME,
         ACTION_COMMIT,
         ACTION_DRAW_IF_POSSIBLE,
         ACTION_DRAW_FORCED,
-        ACTION_BEGIN_OUTPUT_SURFACE_RECREATION,
+        ACTION_BEGIN_CONTEXT_RECREATION,
         ACTION_ACQUIRE_LAYER_TEXTURES_FOR_MAIN_THREAD,
     };
     Action nextAction() const;
     void updateState(Action);
 
     // Indicates whether the scheduler needs a vsync callback in order to make
     // progress.
     bool vsyncCallbackNeeded() const;
 
     // Indicates that the system has entered and left a vsync callback.
@@ skipping 41 matching lines @@
     void setMainThreadNeedsLayerTextures();
 
     // Indicates whether we can successfully begin a frame at this time.
     void setCanBeginFrame(bool can) { m_canBeginFrame = can; }
 
     // Indicates whether drawing would, at this time, make sense.
     // canDraw can be used to supress flashes or checkerboarding
     // when such behavior would be undesirable.
     void setCanDraw(bool can) { m_canDraw = can; }
 
-    void didLoseOutputSurface();
-    void didRecreateOutputSurface();
+    void didLoseContext();
+    void didRecreateContext();
 
     // Exposed for testing purposes.
     void setMaximumNumberOfFailedDrawsBeforeDrawIsForced(int);
 
     std::string toString();
 
 protected:
     bool shouldDrawForced() const;
     bool drawSuspendedUntilCommit() const;
     bool scheduledToDraw() const;
@@ skipping 13 matching lines @@
     bool m_needsCommit;
     bool m_needsForcedCommit;
     bool m_expectImmediateBeginFrame;
     bool m_mainThreadNeedsLayerTextures;
     bool m_insideVSync;
     bool m_visible;
     bool m_canBeginFrame;
     bool m_canDraw;
     bool m_drawIfPossibleFailed;
     TextureState m_textureState;
-    OutputSurfaceState m_outputSurfaceState;
+    ContextState m_contextState;
 
     DISALLOW_COPY_AND_ASSIGN(SchedulerStateMachine);
 };
 
 }
 
 #endif  // CC_SCHEDULER_STATE_MACHINE_H_