Clean up some VrShell threading issues and remove unnecessary WeakPtr types.

device/vr/android/gvr/gvr_device.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 "device/vr/android/gvr/gvr_device.h"
 
 #include <math.h>
 #include <algorithm>
 
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
 #include "device/vr/android/gvr/gvr_delegate.h"
 #include "device/vr/android/gvr/gvr_device_provider.h"
 #include "device/vr/vr_device_manager.h"
 #include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr.h"
 #include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr_types.h"
 #include "ui/gfx/transform.h"
 #include "ui/gfx/transform_util.h"
 
 namespace device {
 
 namespace {
 
 static const uint64_t kPredictionTimeWithoutVsyncNanos = 50000000;
 
 }  // namespace
 
-GvrDevice::GvrDevice(GvrDeviceProvider* provider,
-                     const base::WeakPtr<GvrDelegate>& delegate)
+GvrDevice::GvrDevice(GvrDeviceProvider* provider, GvrDelegate* delegate)
     : VRDevice(), delegate_(delegate), gvr_provider_(provider) {}
 
 GvrDevice::~GvrDevice() {}
 
 mojom::VRDisplayInfoPtr GvrDevice::GetVRDevice() {
   TRACE_EVENT0("input", "GvrDevice::GetVRDevice");
 
   mojom::VRDisplayInfoPtr device = mojom::VRDisplayInfo::New();
 
   device->index = id();
@@ skipping 44 matching lines @@
     left_eye->offset[0] = -0.0;
     left_eye->offset[1] = -0.0;
     left_eye->offset[2] = -0.03;
 
     right_eye->offset[0] = 0.0;
     right_eye->offset[1] = 0.0;
     right_eye->offset[2] = 0.03;
 
     // Tell the delegate not to draw yet, to avoid a race condition
     // (and visible wobble) on entering VR.
-    delegate_->SetWebVRRenderSurfaceSize(kInvalidRenderTargetSize.width,
-                                         kInvalidRenderTargetSize.height);
+    if (delegate_) {
+      delegate_->SetWebVRRenderSurfaceSize(kInvalidRenderTargetSize.width,
+                                           kInvalidRenderTargetSize.height);
+    }
 
     return device;
   }
 
   // In compositor mode, we have to use the current compositor window's
   // surface size. Would be nice to change it, but that needs more browser
   // internals to be modified. TODO(klausw,crbug.com/655722): remove this once
   // we can pick our own surface size.
   gvr::Sizei compositor_size = delegate_->GetWebVRCompositorSurfaceSize();
   left_eye->renderWidth = compositor_size.width / 2;
@@ skipping 28 matching lines @@
   gvr::Mat4f left_eye_mat = gvr_api->GetEyeFromHeadMatrix(GVR_LEFT_EYE);
   left_eye->offset[0] = -left_eye_mat.m[0][3];
   left_eye->offset[1] = -left_eye_mat.m[1][3];
   left_eye->offset[2] = -left_eye_mat.m[2][3];
 
   gvr::Mat4f right_eye_mat = gvr_api->GetEyeFromHeadMatrix(GVR_RIGHT_EYE);
   right_eye->offset[0] = -right_eye_mat.m[0][3];
   right_eye->offset[1] = -right_eye_mat.m[1][3];
   right_eye->offset[2] = -right_eye_mat.m[2][3];
 
-  delegate_->SetWebVRRenderSurfaceSize(2 * left_eye->renderWidth,
-                                       left_eye->renderHeight);
+  if (delegate_) {
+    delegate_->SetWebVRRenderSurfaceSize(2 * left_eye->renderWidth,
+                                         left_eye->renderHeight);
+  }
 
   return device;
 }
 
 mojom::VRPosePtr GvrDevice::GetPose() {
   TRACE_EVENT0("input", "GvrDevice::GetSensorState");
 
   mojom::VRPosePtr pose = mojom::VRPose::New();
 
   pose->timestamp = base::Time::Now().ToJsTime();
@@ skipping 95 matching lines @@
 
   gvr::Rectf right_gvr_bounds;
   right_gvr_bounds.left = right_bounds->left;
   right_gvr_bounds.top = 1.0f - right_bounds->top;
   right_gvr_bounds.right = right_bounds->left + right_bounds->width;
   right_gvr_bounds.bottom = 1.0f - (right_bounds->top + right_bounds->height);
 
   delegate_->UpdateWebVRTextureBounds(left_gvr_bounds, right_gvr_bounds);
 }
 
-void GvrDevice::SetDelegate(const base::WeakPtr<GvrDelegate>& delegate) {
+void GvrDevice::SetDelegate(GvrDelegate* delegate) {
   delegate_ = delegate;
 
   // Notify the clients that this device has changed
   if (delegate_) {
     delegate_->SetWebVRSecureOrigin(secure_origin_);
     OnChanged();
   }
 }
 
 gvr::GvrApi* GvrDevice::GetGvrApi() {
   if (!delegate_)
     return nullptr;
 
   return delegate_->gvr_api();
 }
 
 }  // namespace device