diff options
| author | aelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-19 03:39:37 +0000 |
|---|---|---|
| committer | aelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-19 03:39:37 +0000 |
| commit | 65bfd9976b93353a62da4946206448a0e4dd0ba1 (patch) | |
| tree | a0237b4901796ab7e74caad09baadf90b64ce613 /cc/layer_unittest.cc | |
| parent | 789ad9876d1e731046b0bf648f43bbe1ac0836c1 (diff) | |
| download | chromium_src-65bfd9976b93353a62da4946206448a0e4dd0ba1.zip chromium_src-65bfd9976b93353a62da4946206448a0e4dd0ba1.tar.gz chromium_src-65bfd9976b93353a62da4946206448a0e4dd0ba1.tar.bz2 | |
Move CC switches to cc/switches.h.
This moves these switches to their appropriate place, and sets them all
directly from command-line flags there. I deleted the WebCompositor
setter methods, but setters are still needed in CCSettings for unit
tests.
BUG=
Review URL: https://chromiumcodereview.appspot.com/11186039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162921 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layer_unittest.cc')
| -rw-r--r-- | cc/layer_unittest.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cc/layer_unittest.cc b/cc/layer_unittest.cc index d10d891..f9da0aa 100644 --- a/cc/layer_unittest.cc +++ b/cc/layer_unittest.cc @@ -14,6 +14,8 @@ #include "cc/test/fake_layer_tree_host_client.h" #include "cc/test/geometry_test_utils.h" #include "cc/test/web_compositor_initializer.h" +#include "cc/test/test_common.h" +#include "cc/settings.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include <public/WebTransformationMatrix.h> @@ -806,7 +808,8 @@ TEST(LayerChromiumLayerTreeHostTest, shouldNotAddAnimationWithoutLayerTreeHost) // layers cannot actually animate yet. So, to prevent violating this WebCore assumption, // the animation should not be accepted if the layer doesn't already have a layerTreeHost. - WebKit::Platform::current()->compositorSupport()->setAcceleratedAnimationEnabled(true); + CCScopedSettings scopedSettings; + Settings::setAcceleratedAnimationEnabled(true); WebCompositorInitializer compositorInitializer(0); scoped_refptr<LayerChromium> layer = LayerChromium::create(); |