diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-14 21:24:26 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-14 21:24:26 +0000 |
| commit | 9bdcfd64a8555352b63437db70ff06eabd259a16 (patch) | |
| tree | 7f6a45d10ddb164da79e4bedcbd5aa501ffe2132 /cc/gl_renderer_unittest.cc | |
| parent | 017b4f7b3f6f59a62cd296caa66db693aabd7cde (diff) | |
| download | chromium_src-9bdcfd64a8555352b63437db70ff06eabd259a16.zip chromium_src-9bdcfd64a8555352b63437db70ff06eabd259a16.tar.gz chromium_src-9bdcfd64a8555352b63437db70ff06eabd259a16.tar.bz2 | |
cc: Remove cc::settings, move them to LayerTreeSettings.
For now, we don't want to make plumbing through the WebKit API for all these
settings. So they are marked with a TODO to move into chromium. When we are
no longer going through the WebKit API from chromium, we can set these settings
in chromium, instead of reading the command-line parameters in cc.
Depends on: https://bugs.webkit.org/show_bug.cgi?id=102146
R=jamesr
BUG=160771
Review URL: https://chromiumcodereview.appspot.com/11361223
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167750 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/gl_renderer_unittest.cc')
| -rw-r--r-- | cc/gl_renderer_unittest.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/cc/gl_renderer_unittest.cc b/cc/gl_renderer_unittest.cc index eb5f1fb..3d3f68a 100644 --- a/cc/gl_renderer_unittest.cc +++ b/cc/gl_renderer_unittest.cc @@ -7,10 +7,8 @@ #include "cc/draw_quad.h" #include "cc/prioritized_resource_manager.h" #include "cc/resource_provider.h" -#include "cc/settings.h" #include "cc/test/fake_web_compositor_output_surface.h" #include "cc/test/fake_web_graphics_context_3d.h" -#include "cc/test/test_common.h" #include "cc/test/render_pass_test_common.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -138,7 +136,6 @@ protected: FakeRendererClient m_mockClient; scoped_ptr<ResourceProvider> m_resourceProvider; FakeRendererGL m_renderer; - ScopedSettings m_scopedSettings; }; // Test GLRenderer discardFramebuffer functionality: @@ -295,7 +292,6 @@ public: // This test isn't using the same fixture as GLRendererTest, and you can't mix TEST() and TEST_F() with the same name, hence LRC2. TEST(GLRendererTest2, initializationDoesNotMakeSynchronousCalls) { - ScopedSettings scopedSettings; FakeRendererClient mockClient; scoped_ptr<GraphicsContext> context(FakeWebCompositorOutputSurface::create(scoped_ptr<WebKit::WebGraphicsContext3D>(new ForbidSynchronousCallContext))); scoped_ptr<ResourceProvider> resourceProvider(ResourceProvider::create(context.get())); @@ -339,7 +335,6 @@ private: TEST(GLRendererTest2, initializationWithQuicklyLostContextDoesNotAssert) { - ScopedSettings scopedSettings; FakeRendererClient mockClient; scoped_ptr<GraphicsContext> context(FakeWebCompositorOutputSurface::create(scoped_ptr<WebKit::WebGraphicsContext3D>(new LoseContextOnFirstGetContext))); scoped_ptr<ResourceProvider> resourceProvider(ResourceProvider::create(context.get())); |