Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(96)

Unified Diff: cc/threaded_unittest.cc

Issue 11186039: Move CC switches to cc/switches.h. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Switch ui/compositor back to using compositorSupport() Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/test/test_common.h ('k') | chrome/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/threaded_unittest.cc
diff --git a/cc/threaded_unittest.cc b/cc/threaded_unittest.cc
index 6a323a90725dc767eba36f77b96dc05f45e5866c..9a5b2b88a30c2f4186dfecd4330a8869ff13403d 100644
--- a/cc/threaded_unittest.cc
+++ b/cc/threaded_unittest.cc
@@ -24,6 +24,8 @@
#include "cc/test/fake_web_graphics_context_3d.h"
#include "cc/test/occlusion_tracker_test_common.h"
#include "cc/test/tiled_layer_test_common.h"
+#include "cc/test/test_common.h"
+#include "cc/settings.h"
#include "testing/gmock/include/gmock/gmock.h"
#include <public/Platform.h>
#include <public/WebCompositorSupport.h>
@@ -526,7 +528,8 @@ void CCThreadedTest::dispatchDidAddAnimation()
void CCThreadedTest::runTest(bool threaded)
{
// For these tests, we will enable threaded animations.
- Platform::current()->compositorSupport()->setAcceleratedAnimationEnabled(true);
+ CCScopedSettings scopedSettings;
+ Settings::setAcceleratedAnimationEnabled(true);
if (threaded) {
m_webThread.reset(WebKit::Platform::current()->createThread("CCThreadedTest"));
« no previous file with comments | « cc/test/test_common.h ('k') | chrome/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698