Create a mock implementation of the OpenVR API

This change supports testing of Chrome on bots where we don't want to
install or use real OpenVR/SteamVR, in order to catch regressions in
Chrome.

This change also fixes a few issues found in preliminary tests.

BUG=780668

Change-Id: I885762e18b48961038454856743f9e7ae621001e
Reviewed-on: https://chromium-review.googlesource.com/795056
Commit-Queue: Bill Orr <billorr@chromium.org>
Reviewed-by: Klaus Weidner <klausw@chromium.org>
Cr-Commit-Position: refs/heads/master@{#523323}

device/vr/BUILD.gn

@@ -70,9 +70,7 @@ if (enable_vr) {
         "//third_party/WebKit/public:blink_headers",
       ]
       ldflags = [ "-landroid" ]
-      libs = [
-        "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a",
-      ]
+      libs = [ "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a" ]
       configs += [ "//third_party/gvr-android-sdk:libgvr_config" ]
     }
 
@@ -153,6 +151,28 @@ if (enable_vr) {
   }
 }
 
+if (enable_openvr) {
+  shared_library("openvr_mock") {
+    output_name = "mock_vr_clients/bin/vrclient"
+    if (target_cpu == "x64" && is_win) {
+      output_name = "mock_vr_clients/bin/vrclient_x64"
+    }
+
+    sources = [
+      "openvr/test/fake_openvr_impl_api.cc",
+    ]
+
+    libs = [
+      "d3d11.lib",
+      "DXGI.lib",
+    ]
+
+    deps = [
+      "//base",
+    ]
+  }
+}
+
 if (enable_gvr_services) {
   java_sources_needing_jni =
       [ "android/java/src/org/chromium/device/vr/NonPresentingGvrContext.java" ]

device/vr/openvr/openvr_device_provider.cc

@@ -16,6 +16,10 @@ OpenVRDeviceProvider::OpenVRDeviceProvider() = default;
 OpenVRDeviceProvider::~OpenVRDeviceProvider() {
   device::GamepadDataFetcherManager::GetInstance()->RemoveSourceFactory(
       device::GAMEPAD_SOURCE_OPENVR);
+  // We must set device_ to null before calling VR_Shutdown, because VR_Shutdown
+  // will unload OpenVR's dll, and device_ (or its render loop) are potentially
+  // still using it.
+  device_ = nullptr;
   vr::VR_Shutdown();
 }
 

device/vr/openvr/test/DEPS

+include_rules = [
+  "+third_party/openvr/src",
+]

device/vr/windows/d3d11_texture_helper.cc

@@ -30,7 +30,6 @@ bool D3D11TextureHelper::CopyTextureToBackBuffer(bool flipY) {
     return false;
 
   HRESULT hr = render_state_.keyed_mutex_->AcquireSync(1, kAcquireWaitMS);
-  DCHECK(SUCCEEDED(hr) && hr != WAIT_TIMEOUT && hr != WAIT_ABANDONED);
   if (FAILED(hr) || hr == WAIT_TIMEOUT || hr == WAIT_ABANDONED) {
     // We failed to acquire the lock.  We'll drop this frame, but subsequent
     // frames won't be affected.

third_party/WebKit/Source/modules/vr/VRDisplay.cpp

@@ -737,12 +737,19 @@ void VRDisplay::submitFrame() {
     client->DrawingBufferClientRestoreFramebufferBinding();
     client->DrawingBufferClientRestoreRenderbufferBinding();
 
-    // We decompose the cloned handle, and use it to create a mojo::ScopedHandle
-    // which will own cleanup of the handle, and will be passed over IPC.
-    gfx::GpuMemoryBufferHandle gpu_handle =
-        CloneHandleForIPC(gpu_memory_buffer->GetHandle());
-    vr_presentation_provider_->SubmitFrameWithTextureHandle(
-        vr_frame_id_, mojo::WrapPlatformFile(gpu_handle.handle.GetHandle()));
+    // We can fail to obtain a GpuMemoryBuffer if we don't have GPU support, or
+    // for some out-of-memory situations.
+    // TODO(billorr): Consider whether we should just drop the frame or exit
+    // presentation.
+    if (gpu_memory_buffer) {
+      // We decompose the cloned handle, and use it to create a
+      // mojo::ScopedHandle which will own cleanup of the handle, and will be
+      // passed over IPC.
+      gfx::GpuMemoryBufferHandle gpu_handle =
+          CloneHandleForIPC(gpu_memory_buffer->GetHandle());
+      vr_presentation_provider_->SubmitFrameWithTextureHandle(
+          vr_frame_id_, mojo::WrapPlatformFile(gpu_handle.handle.GetHandle()));
+    }
 #else
     NOTIMPLEMENTED();
 #endif