Revert 245445 "Unifies LayerTreeHost::SetNeedsUpdateLayers and S..."

trunk/src/cc/trees/thread_proxy.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_TREES_THREAD_PROXY_H_
 #define CC_TREES_THREAD_PROXY_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 31 matching lines @@
 
   // Proxy implementation
   virtual bool CompositeAndReadback(void* pixels,
                                     const gfx::Rect& rect) OVERRIDE;
   virtual void FinishAllRendering() OVERRIDE;
   virtual bool IsStarted() const OVERRIDE;
   virtual void SetLayerTreeHostClientReady() OVERRIDE;
   virtual void SetVisible(bool visible) OVERRIDE;
   virtual void CreateAndInitializeOutputSurface() OVERRIDE;
   virtual const RendererCapabilities& GetRendererCapabilities() const OVERRIDE;
+  virtual void SetNeedsAnimate() OVERRIDE;
   virtual void SetNeedsUpdateLayers() OVERRIDE;
   virtual void SetNeedsCommit() OVERRIDE;
   virtual void SetNeedsRedraw(const gfx::Rect& damage_rect) OVERRIDE;
   virtual void SetNextCommitWaitsForActivation() OVERRIDE;
   virtual void NotifyInputThrottledUntilCommit() OVERRIDE;
   virtual void SetDeferCommits(bool defer_commits) OVERRIDE;
   virtual bool CommitRequested() const OVERRIDE;
   virtual bool BeginMainFrameRequested() const OVERRIDE;
   virtual void MainThreadHasStoppedFlinging() OVERRIDE;
   virtual void Start() OVERRIDE;
@@ skipping 134 matching lines @@
   void StartScrollbarAnimationOnImplThread();
   void MainThreadHasStoppedFlingingOnImplThread();
   void SetInputThrottledUntilCommitOnImplThread(bool is_throttled);
   LayerTreeHost* layer_tree_host();
   const LayerTreeHost* layer_tree_host() const;
   PrioritizedResourceManager* contents_texture_manager_on_main_thread();
   PrioritizedResourceManager* contents_texture_manager_on_impl_thread();
 
   // Accessed on main thread only.
 
-  // Set only when SetNeedsUpdateLayers is called.
-  bool update_requested_;
+  // Set only when SetNeedsAnimate is called.
+  bool animate_requested_;
   // Set only when SetNeedsCommit is called.
   bool commit_requested_;
-  // Set by both SetNeedsUpdateLayers and SetNeedsCommit.
+  // Set by SetNeedsAnimate, SetNeedsUpdateLayers, and SetNeedsCommit.
   bool commit_request_sent_to_impl_thread_;
   // Set by BeginMainFrame
   bool created_offscreen_context_provider_;
   base::CancelableClosure output_surface_creation_callback_;
   // Don't use this variable directly, go through layer_tree_host() to ensure it
   // is only used on the main thread or if the main thread is blocked.
   LayerTreeHost* layer_tree_host_unsafe_;
   // Use one of the contents_texture_manager_on functions above instead of using
   // this variable directly.
   PrioritizedResourceManager* contents_texture_manager_unsafe_;
@@ skipping 67 matching lines @@
   base::WeakPtrFactory<ThreadProxy> weak_factory_;
 
   const int layer_tree_host_id_;
 
   DISALLOW_COPY_AND_ASSIGN(ThreadProxy);
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_THREAD_PROXY_H_