summaryrefslogtreecommitdiffstats
path: root/mojo/aura
diff options
context:
space:
mode:
authorpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-10 19:00:51 +0000
committerpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-10 19:00:51 +0000
commit7898d1937f190eb432756319712878735f4b261d (patch)
treeecc4c40a69f65d54bd8bfaab21d5a2489093fb50 /mojo/aura
parentc56a01755f124848b6318ba2416d5695e741126a (diff)
downloadchromium_src-7898d1937f190eb432756319712878735f4b261d.zip
chromium_src-7898d1937f190eb432756319712878735f4b261d.tar.gz
chromium_src-7898d1937f190eb432756319712878735f4b261d.tar.bz2
ui/compositor: move the browser compositor thread to the ContextFactory
Trying to get rid of more globals in ui/compositor. BUG=None Review URL: https://codereview.chromium.org/277713002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269608 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/aura')
-rw-r--r--mojo/aura/context_factory_mojo.cc4
-rw-r--r--mojo/aura/context_factory_mojo.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/mojo/aura/context_factory_mojo.cc b/mojo/aura/context_factory_mojo.cc
index 1dbca80..3edee0b 100644
--- a/mojo/aura/context_factory_mojo.cc
+++ b/mojo/aura/context_factory_mojo.cc
@@ -63,4 +63,8 @@ cc::SharedBitmapManager* ContextFactoryMojo::GetSharedBitmapManager() {
return NULL;
}
+base::MessageLoopProxy* ContextFactoryMojo::GetCompositorMessageLoop() {
+ return NULL;
+}
+
} // namespace mojo
diff --git a/mojo/aura/context_factory_mojo.h b/mojo/aura/context_factory_mojo.h
index a842428..485dc9f 100644
--- a/mojo/aura/context_factory_mojo.h
+++ b/mojo/aura/context_factory_mojo.h
@@ -36,6 +36,7 @@ class ContextFactoryMojo : public ui::ContextFactory {
virtual void RemoveCompositor(ui::Compositor* compositor) OVERRIDE;
virtual bool DoesCreateTestContexts() OVERRIDE;
virtual cc::SharedBitmapManager* GetSharedBitmapManager() OVERRIDE;
+ virtual base::MessageLoopProxy* GetCompositorMessageLoop() OVERRIDE;
private:
scoped_refptr<webkit::gpu::ContextProviderInProcess>