Fix some thread safety violations in device::GvrDelegate implementation.

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"
@@ skipping 160 matching lines @@
     // regarding jank in this case, because we're switching from 3D to 2D,
     // adding/removing a bunch of Java views, and probably changing device
     // orientation here.
     base::ThreadRestrictions::ScopedAllowIO allow_io;
     gl_thread_.reset();
   }
   delegate_->RemoveDelegate();
   g_instance = nullptr;
 }
 
-void VrShell::SetGvrPoseForWebVr(const gvr::Mat4f& pose, uint32_t pose_num) {
-  GLThread* thread = static_cast<GLThread*>(gl_thread_.get());
-  if (thread->GetVrShellGlUnsafe()) {
-    thread->GetVrShellGlUnsafe()->SetGvrPoseForWebVr(pose, pose_num);
-  }
-}
-
-void VrShell::SetWebVRRenderSurfaceSize(int width, int height) {
-  GLThread* thread = static_cast<GLThread*>(gl_thread_.get());
-  if (thread->GetVrShellGlUnsafe()) {
-    thread->GetVrShellGlUnsafe()->SetWebVRRenderSurfaceSize(width, height);
-  }
-}
-
-gvr::Sizei VrShell::GetWebVRCompositorSurfaceSize() {
-  GLThread* thread = static_cast<GLThread*>(gl_thread_.get());
-  if (thread->GetVrShellGlUnsafe()) {
-    return thread->GetVrShellGlUnsafe()->GetWebVRCompositorSurfaceSize();
-  }
-  return gvr::Sizei();
-}
-
 void VrShell::OnTriggerEvent(JNIEnv* env,
                              const JavaParamRef<jobject>& obj) {
   GLThread* thread = static_cast<GLThread*>(gl_thread_.get());
   thread->task_runner()->PostTask(FROM_HERE,
                                   base::Bind(&VrShellGl::OnTriggerEvent,
                                              thread->GetVrShellGl()));
 }
 
 void VrShell::OnPause(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   GLThread* thread = static_cast<GLThread*>(gl_thread_.get());
@@ skipping 39 matching lines @@
                            const base::android::JavaParamRef<jobject>& obj,
                            bool enabled) {
   metrics_helper_->SetWebVREnabled(enabled);
   if (enabled) {
     html_interface_->SetMode(UiInterface::Mode::WEB_VR);
   } else {
     html_interface_->SetMode(UiInterface::Mode::STANDARD);
   }
 }
 
+void VrShell::SetGvrPoseForWebVr(const gvr::Mat4f& pose, uint32_t pose_num) {
+  GLThread* thread = static_cast<GLThread*>(gl_thread_.get());
+  thread->task_runner()->PostTask(
+      FROM_HERE, base::Bind(&VrShellGl::SetGvrPoseForWebVr,
+                            thread->GetVrShellGl(), pose, pose_num));
+}
+
+void VrShell::SetWebVRRenderSurfaceSize(int width, int height) {
+  // TODO(klausw,crbug.com/655722): Change the GVR render size and set the WebVR
+  // render surface size.
+}
+
+gvr::Sizei VrShell::GetWebVRCompositorSurfaceSize() {
+  const gfx::Size& size = content_compositor_->GetWindowBounds();
+  return {size.width(), size.height()};
+}
+
 void VrShell::SetWebVRSecureOrigin(bool secure_origin) {
   // TODO(cjgrant): Align this state with the logic that drives the omnibox.
   html_interface_->SetWebVRSecureOrigin(secure_origin);
 }
 
 void VrShell::SubmitWebVRFrame() {}
 
 void VrShell::UpdateWebVRTextureBounds(const gvr::Rectf& left_bounds,
                                        const gvr::Rectf& right_bounds) {
   GLThread* thread = static_cast<GLThread*>(gl_thread_.get());
-  if (thread->GetVrShellGlUnsafe()) {
-    thread->GetVrShellGlUnsafe()->UpdateWebVRTextureBounds(left_bounds,
-                                                           right_bounds);
-  }
+  thread->task_runner()->PostTask(
+      FROM_HERE, base::Bind(&VrShellGl::UpdateWebVRTextureBounds,
+                            thread->GetVrShellGl(), left_bounds, right_bounds));
 }
 
 // TODO(mthiesse): Do not expose GVR API outside of GL thread.
 // It's not thread-safe.
 gvr::GvrApi* VrShell::gvr_api() {
   GLThread* thread = static_cast<GLThread*>(gl_thread_.get());
   if (thread->GetVrShellGlUnsafe()) {
     return thread->GetVrShellGlUnsafe()->gvr_api();
   }
   CHECK(false);
@@ skipping 14 matching lines @@
                                    jint width, jint height, jfloat dpr) {
   TRACE_EVENT0("gpu", "VrShell::ContentBoundsChanged");
   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();
   CHECK(thread->task_runner()->PostTask(
       FROM_HERE, base::Bind(&VrShellGl::ContentPhysicalBoundsChanged,
                             thread->GetVrShellGl(),
                             width, height)));
-  content_compositor_->SetWindowBounds(width, height);
+  content_compositor_->SetWindowBounds(gfx::Size(width, height));
 }
 
 void VrShell::UIBoundsChanged(JNIEnv* env,
                               const JavaParamRef<jobject>& object,
                               jint width, jint height, jfloat dpr) {
   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::UIPhysicalBoundsChanged,
                             thread->GetVrShellGl(),
                             width, height));
-  ui_compositor_->SetWindowBounds(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();
   }
@@ skipping 69 matching lines @@
   thread->task_runner()->PostTask(
       FROM_HERE, base::Bind(&VrShellGl::ContentBoundsChanged,
                             thread->GetVrShellGl(),
                             display.size().width(), display.size().height()));
 }
 
 void VrShell::WebContentsDestroyed() {
   ui_input_manager_.reset();
   ui_contents_ = nullptr;
   // TODO(mthiesse): Handle web contents being destroyed.
-  ForceExitVR();
+  ForceExitVr();
 }
 
 void VrShell::ContentWebContentsDestroyed() {
   content_input_manager_.reset();
   main_contents_ = nullptr;
   // TODO(mthiesse): Handle web contents being destroyed.
-  ForceExitVR();
+  ForceExitVr();
 }
 
 void VrShell::ContentWasHidden() {
   // Ensure we don't continue sending input to it.
   content_input_manager_.reset();
   // TODO(mthiesse): Handle web contents being hidden.
-  ForceExitVR();
+  ForceExitVr();
 }
 
-void VrShell::ForceExitVR() {
+void VrShell::ForceExitVr() {
   delegate_->ForceExitVr();
 }
 
 void VrShell::SetContentCssSize(float width, float height, float dpr) {
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_VrShellImpl_setContentCssSize(env, j_vr_shell_.obj(), width, height,
                                      dpr);
 }
 
 void VrShell::SetUiCssSize(float width, float height, float dpr) {
@@ skipping 15 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