| Index: mojo/runner/android/native_viewport_application_loader.cc
|
| diff --git a/mojo/runner/android/native_viewport_application_loader.cc b/mojo/runner/android/native_viewport_application_loader.cc
|
| index 459f08a9434954ffcfe3e5821c3829079673198c..134f8098057be38e8c7f8d27994fd41e837476d2 100644
|
| --- a/mojo/runner/android/native_viewport_application_loader.cc
|
| +++ b/mojo/runner/android/native_viewport_application_loader.cc
|
| @@ -36,7 +36,12 @@ void NativeViewportApplicationLoader::Create(
|
| InterfaceRequest<NativeViewport> request) {
|
| if (!gpu_state_)
|
| gpu_state_ = new gles2::GpuState;
|
| - new native_viewport::NativeViewportImpl(false, gpu_state_, request.Pass());
|
| + // Pass a null AppRefCount because on Android the NativeViewPort app must
|
| + // live on the main thread and we don't want to exit that when all the native
|
| + // viewports are gone.
|
| + new native_viewport::NativeViewportImpl(
|
| + false, gpu_state_, request.Pass(),
|
| + make_scoped_ptr<mojo::AppRefCount>(nullptr));
|
| }
|
|
|
| void NativeViewportApplicationLoader::Create(ApplicationConnection* connection,
|
|
|