CC Animation: Erase cc::LayerSettings everywhere.

cc/test/layer_tree_test.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_TEST_LAYER_TREE_TEST_H_
 #define CC_TEST_LAYER_TREE_TEST_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/threading/thread.h"
 #include "cc/animation/animation_delegate.h"
-#include "cc/layers/layer_settings.h"
 #include "cc/test/proxy_impl_for_test.h"
 #include "cc/test/proxy_main_for_test.h"
 #include "cc/test/remote_proto_channel_bridge.h"
 #include "cc/test/test_hooks.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/layer_tree_host_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
 class AnimationPlayer;
@@ skipping 12 matching lines @@
 class TestWebGraphicsContext3D;
 class ThreadedChannelForTest;
 
 // Creates the virtual viewport layer hierarchy under the given root_layer.
 // Convenient overload of the method below that creates a scrolling layer as
 // the outer viewport scroll layer.
 void CreateVirtualViewportLayers(Layer* root_layer,
                                  const gfx::Size& inner_bounds,
                                  const gfx::Size& outer_bounds,
                                  const gfx::Size& scroll_bounds,
-                                 LayerTreeHost* host,
-                                 const LayerSettings& layer_settings);
+                                 LayerTreeHost* host);
 
 // Creates the virtual viewport layer hierarchy under the given root_layer.
 // Uses the given scroll layer as the content "outer viewport scroll layer".
 void CreateVirtualViewportLayers(Layer* root_layer,
                                  scoped_refptr<Layer> outer_scroll_layer,
                                  const gfx::Size& outer_bounds,
                                  const gfx::Size& scroll_bounds,
-                                 LayerTreeHost* host,
-                                 const LayerSettings& layer_settings);
+                                 LayerTreeHost* host);
 
 class BeginTask;
 class LayerTreeHostClientForTesting;
 class TimeoutTask;
 
 // The LayerTreeTests runs with the main loop running. It instantiates a single
 // LayerTreeHostForTesting and associated LayerTreeHostImplForTesting and
 // LayerTreeHostClientForTesting.
 //
 // BeginTest() is called once the main message loop is running and the layer
@@ skipping 24 matching lines @@
   void PostSetNeedsRedrawToMainThread();
   void PostSetNeedsRedrawRectToMainThread(const gfx::Rect& damage_rect);
   void PostSetVisibleToMainThread(bool visible);
   void PostSetNextCommitForcesRedrawToMainThread();
   void PostCompositeImmediatelyToMainThread();
   void PostNextCommitWaitsForActivationToMainThread();
 
   void DoBeginTest();
   void Timeout();
 
-  const LayerSettings& layer_settings() { return layer_settings_; }
-
  protected:
   LayerTreeTest();
 
   virtual void InitializeSettings(LayerTreeSettings* settings) {}
-  virtual void InitializeLayerSettings(LayerSettings* layer_settings) {}
 
   void RealEndTest();
 
   virtual void DispatchAddAnimationToPlayer(
       AnimationPlayer* player_to_receive_animation,
       double animation_duration);
   void DispatchSetDeferCommits(bool defer_commits);
   void DispatchSetNeedsCommit();
   void DispatchSetNeedsUpdateLayers();
   void DispatchSetNeedsRedraw();
@@ skipping 75 matching lines @@
       return gfx::Vector2dF(layer_impl->synced_scroll_offset()->Delta().x(),
                             layer_impl->synced_scroll_offset()->Delta().y());
     else
       return gfx::Vector2dF(
           layer_impl->synced_scroll_offset()->PendingDelta().get().x(),
           layer_impl->synced_scroll_offset()->PendingDelta().get().y());
   }
 
  private:
   LayerTreeSettings settings_;
-  LayerSettings layer_settings_;
 
   CompositorMode mode_;
 
   scoped_ptr<LayerTreeHostClientForTesting> client_;
   scoped_ptr<LayerTreeHost> layer_tree_host_;
 
   // The LayerTreeHost created by the cc embedder on the client in remote mode.
   scoped_ptr<LayerTreeHostForTesting> remote_client_layer_tree_host_;
 
   FakeOutputSurface* output_surface_;
@@ skipping 73 matching lines @@
 #define SINGLE_AND_MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME)            \
   SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F(TEST_FIXTURE_NAME); \
   SINGLE_AND_MULTI_THREAD_DELEGATING_RENDERER_TEST_F(TEST_FIXTURE_NAME)
 
 // Some tests want to control when notify ready for activation occurs,
 // but this is not supported in the single-threaded case.
 #define MULTI_THREAD_BLOCKNOTIFY_TEST_F(TEST_FIXTURE_NAME) \
   MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME)
 
 #endif  // CC_TEST_LAYER_TREE_TEST_H_