diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 21:21:59 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 21:21:59 +0000 |
| commit | 5bc29a2dabe01f1e2315bcc287f11db10df4144b (patch) | |
| tree | 0c451bebe2c40e867a935b5f52b25a242f5f825c /cc/software_renderer_unittest.cc | |
| parent | 4d8bb1a91681f8e48cc5e6b7ac29f3723eadf0d5 (diff) | |
| download | chromium_src-5bc29a2dabe01f1e2315bcc287f11db10df4144b.zip chromium_src-5bc29a2dabe01f1e2315bcc287f11db10df4144b.tar.gz chromium_src-5bc29a2dabe01f1e2315bcc287f11db10df4144b.tar.bz2 | |
Revert 165476 - Remove static thread pointers from CC
Might be causing webkit_unit_tests to fail on mac/win
BUG=152904
Review URL: https://codereview.chromium.org/11232051
TBR=jamesr@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165501 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/software_renderer_unittest.cc')
| -rw-r--r-- | cc/software_renderer_unittest.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cc/software_renderer_unittest.cc b/cc/software_renderer_unittest.cc index 3eb4012..a04864a 100644 --- a/cc/software_renderer_unittest.cc +++ b/cc/software_renderer_unittest.cc @@ -10,6 +10,7 @@ #include "cc/render_pass.h" #include "cc/render_pass_draw_quad.h" #include "cc/settings.h" +#include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread #include "cc/solid_color_draw_quad.h" #include "cc/test/animation_test_common.h" #include "cc/test/fake_web_compositor_output_surface.h" @@ -49,9 +50,10 @@ public: virtual void setFullRootLayerDamage() OVERRIDE { } virtual void setManagedMemoryPolicy(const ManagedMemoryPolicy& policy) OVERRIDE { }; virtual void enforceManagedMemoryPolicy(const ManagedMemoryPolicy& policy) OVERRIDE { }; - virtual bool hasImplThread() const OVERRIDE { return false; } protected: + DebugScopedSetImplThread m_alwaysImplThread; + scoped_ptr<FakeWebCompositorOutputSurface> m_outputSurface; scoped_ptr<ResourceProvider> m_resourceProvider; scoped_ptr<SoftwareRenderer> m_renderer; |