summaryrefslogtreecommitdiffstats
path: root/mojo/examples/compositor_app
diff options
context:
space:
mode:
authordavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-08 23:33:36 +0000
committerdavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-08 23:33:36 +0000
commitbe88d4cb2d8f7e63c92207649d91345b79d77f51 (patch)
tree7009aa39be187cada475d6532bf98df35f6c795e /mojo/examples/compositor_app
parentf3364a26ae5ef64346a04ac3483bc28b6efabb21 (diff)
downloadchromium_src-be88d4cb2d8f7e63c92207649d91345b79d77f51.zip
chromium_src-be88d4cb2d8f7e63c92207649d91345b79d77f51.tar.gz
chromium_src-be88d4cb2d8f7e63c92207649d91345b79d77f51.tar.bz2
Remove dependencies on base from SampleApp
- Change to use mojo::utility::RunLoop - Move timer from gles2_client_impl to gles2_impl with added api. BUG=None TEST=None R=darin Review URL: https://codereview.chromium.org/128813002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243695 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/examples/compositor_app')
-rw-r--r--mojo/examples/compositor_app/gles2_client_impl.cc2
-rw-r--r--mojo/examples/compositor_app/gles2_client_impl.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/mojo/examples/compositor_app/gles2_client_impl.cc b/mojo/examples/compositor_app/gles2_client_impl.cc
index f6849fd..7bd0b06 100644
--- a/mojo/examples/compositor_app/gles2_client_impl.cc
+++ b/mojo/examples/compositor_app/gles2_client_impl.cc
@@ -40,5 +40,7 @@ gpu::ContextSupport* GLES2ClientImpl::Support() const {
void GLES2ClientImpl::ContextLost() { impl_ = NULL; }
+void GLES2ClientImpl::DrawAnimationFrame() {}
+
} // namespace examples
} // namespace mojo
diff --git a/mojo/examples/compositor_app/gles2_client_impl.h b/mojo/examples/compositor_app/gles2_client_impl.h
index 38d80b5..fbb49b0 100644
--- a/mojo/examples/compositor_app/gles2_client_impl.h
+++ b/mojo/examples/compositor_app/gles2_client_impl.h
@@ -38,6 +38,7 @@ class GLES2ClientImpl : public GLES2Client {
uint32_t width,
uint32_t height) MOJO_OVERRIDE;
virtual void ContextLost() MOJO_OVERRIDE;
+ virtual void DrawAnimationFrame() MOJO_OVERRIDE;
base::Callback<void(gfx::Size viewport_size)> context_created_callback_;
gpu::gles2::GLES2Implementation* impl_;