diff options
| author | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-05 00:44:28 +0000 |
|---|---|---|
| committer | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-05 00:44:28 +0000 |
| commit | e1d0d62afb1c251c976e498df738460f6211a29d (patch) | |
| tree | e37c6e00ee7e1ec0da10374bfe529ff5e79bfab2 /mojo/apps/js/main.cc | |
| parent | a9fcce36c432e0e7009fbabde59779970cb76b5a (diff) | |
| download | chromium_src-e1d0d62afb1c251c976e498df738460f6211a29d.zip chromium_src-e1d0d62afb1c251c976e498df738460f6211a29d.tar.gz chromium_src-e1d0d62afb1c251c976e498df738460f6211a29d.tar.bz2 | |
Update mojo.js to use native_viewport
This CL moves mojo.js from using hello_world_service to using native_viewport.
Now mojo.js creates a viewport, but we're still not able to draw GL becaues we
don't have WebGL bindings.
R=aa@chromium.org
BUG=324643
Review URL: https://codereview.chromium.org/98423005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238834 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/apps/js/main.cc')
| -rw-r--r-- | mojo/apps/js/main.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mojo/apps/js/main.cc b/mojo/apps/js/main.cc index 12ec34e..3ecca28 100644 --- a/mojo/apps/js/main.cc +++ b/mojo/apps/js/main.cc @@ -6,6 +6,7 @@ #include "gin/public/isolate_holder.h" #include "mojo/apps/js/mojo_runner_delegate.h" #include "mojo/common/bindings_support_impl.h" +#include "mojo/public/gles2/gles2.h" #include "mojo/public/system/core_cpp.h" #include "mojo/public/system/macros.h" @@ -39,9 +40,11 @@ void Start(MojoHandle pipe, const std::string& module) { extern "C" MOJO_APPS_JS_EXPORT MojoResult CDECL MojoMain(MojoHandle pipe) { mojo::common::BindingsSupportImpl bindings_support; mojo::BindingsSupport::Set(&bindings_support); + MojoGLES2Initialize(); mojo::apps::Start(pipe, "mojo/apps/js/main"); + MojoGLES2Terminate(); mojo::BindingsSupport::Set(NULL); return MOJO_RESULT_OK; } |