diff options
author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-13 19:31:05 +0000 |
---|---|---|
committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-13 19:31:05 +0000 |
commit | 95fc42145e5a8cdb0c7624060bf5bfd298838e19 (patch) | |
tree | 2b9a293e6581a60afbe69fe32177cf2b73704b9e /ui/compositor/compositor.h | |
parent | 14ac682365925234f1f7bc3572f185b69f798814 (diff) | |
download | chromium_src-95fc42145e5a8cdb0c7624060bf5bfd298838e19.zip chromium_src-95fc42145e5a8cdb0c7624060bf5bfd298838e19.tar.gz chromium_src-95fc42145e5a8cdb0c7624060bf5bfd298838e19.tar.bz2 |
aura,cc: Make TestContextProvider usable outside cc.
This makes the TestWebGraphicsContext3D available outside
of cc, and replaces ui::TestWGC3D with the class from cc.
R=jbauman, piman
BUG=258625
Review URL: https://chromiumcodereview.appspot.com/22293007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217308 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/compositor/compositor.h')
-rw-r--r-- | ui/compositor/compositor.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h index b9cdb82..124fe06 100644 --- a/ui/compositor/compositor.h +++ b/ui/compositor/compositor.h @@ -164,10 +164,8 @@ class COMPOSITOR_EXPORT TestContextFactory : public ContextFactory { virtual bool DoesCreateTestContexts() OVERRIDE; private: - static scoped_ptr<WebKit::WebGraphicsContext3D> CreateOffscreenContext(); - scoped_refptr<cc::FakeContextProvider> offscreen_contexts_main_thread_; - scoped_refptr<cc::ContextProvider> offscreen_contexts_compositor_thread_; + scoped_refptr<cc::FakeContextProvider> offscreen_contexts_compositor_thread_; DISALLOW_COPY_AND_ASSIGN(TestContextFactory); }; |