Clean up threading around VR Scene updates.

chrome/browser/android/vr_shell/vr_shell.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/vr_shell/vr_shell.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "base/threading/platform_thread.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/threading/thread_task_runner_handle.h"
+#include "base/values.h"
 #include "chrome/browser/android/vr_shell/ui_interface.h"
 #include "chrome/browser/android/vr_shell/vr_compositor.h"
 #include "chrome/browser/android/vr_shell/vr_input_manager.h"
 #include "chrome/browser/android/vr_shell/vr_shell_delegate.h"
 #include "chrome/browser/android/vr_shell/vr_shell_gl.h"
 #include "chrome/browser/android/vr_shell/vr_usage_monitor.h"
 #include "chrome/browser/android/vr_shell/vr_web_contents_observer.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host.h"
@@ skipping 290 matching lines @@
   // TODO(mthiesse): Remove this blocking wait. Queue up events if thread isn't
   // finished starting?
   thread->WaitUntilThreadStarted();
   thread->task_runner()->PostTask(
       FROM_HERE, base::Bind(&VrShellGl::UIPhysicalBoundsChanged,
                             thread->GetVrShellGl(),
                             width, height));
   ui_compositor_->SetWindowBounds(gfx::Size(width, height));
 }
 
-UiScene* VrShell::GetScene() {
-  GLThread* thread = static_cast<GLThread*>(gl_thread_.get());
-  // TODO(mthiesse): Remove this blocking wait. Queue up events if thread isn't
-  // finished starting?
-  thread->WaitUntilThreadStarted();
-  if (thread->GetVrShellGlUnsafe()) {
-    return thread->GetVrShellGlUnsafe()->GetScene();
-  }
-  return nullptr;
-}
-
 UiInterface* VrShell::GetUiInterface() {
   return html_interface_.get();
 }
 
-void VrShell::QueueTask(base::Callback<void()>& callback) {
-  gl_thread_->task_runner()->PostTask(FROM_HERE, callback);
+void VrShell::UpdateScene(const base::ListValue* args) {
+  GLThread* thread = static_cast<GLThread*>(gl_thread_.get());
+  // TODO(mthiesse): Remove this blocking wait. Queue up events if thread isn't
+  // finished starting?
+  thread->WaitUntilThreadStarted();
+  thread->task_runner()->PostTask(
+      FROM_HERE, base::Bind(&VrShellGl::UpdateScene,
+                            thread->GetVrShellGl(),
+                            base::Passed(args->CreateDeepCopy())));
 }
 
 void VrShell::DoUiAction(const UiAction action) {
   content::NavigationController& controller = main_contents_->GetController();
   switch (action) {
     case HISTORY_BACK:
       if (main_contents_->IsFullscreen()) {
         main_contents_->ExitFullscreen(true /* will_cause_resize */);
       } else if (controller.CanGoBack()) {
         controller.GoBack();
@@ skipping 103 matching lines @@
   return reinterpret_cast<intptr_t>(new VrShell(
       env, obj, content::WebContents::FromJavaWebContents(content_web_contents),
       reinterpret_cast<ui::WindowAndroid*>(content_window_android),
       content::WebContents::FromJavaWebContents(ui_web_contents),
       reinterpret_cast<ui::WindowAndroid*>(ui_window_android),
       for_web_vr, VrShellDelegate::GetNativeDelegate(env, delegate),
       reinterpret_cast<gvr_context*>(gvr_api)));
 }
 
 }  // namespace vr_shell