[vr] Wait a few sec for assets component when entering VR

Bug: 817656
Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_vr;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: I5faf83e3b1eae38ed977716a1329bfddb3fb271c
Reviewed-on: https://chromium-review.googlesource.com/943925
Commit-Queue: Tibor Goldschwendt <tiborg@chromium.org>
Reviewed-by: Christopher Grant <cjgrant@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#540313}(cherry picked from commit 444261f)
Reviewed-on: https://chromium-review.googlesource.com/953102
Reviewed-by: Tibor Goldschwendt <tiborg@chromium.org>
Cr-Commit-Position: refs/branch-heads/3359@{#58}
Cr-Branched-From: 66afc5e-refs/heads/master@{#540276}

Author: Tibor Goldschwendt

chrome/browser/android/vr/vr_gl_thread.cc

@@ -81,10 +81,6 @@ void VrGLThread::Init() {
     }
   }
 
-  if (ui_initial_state_.assets_available) {
-    LoadAssets();
-  }
-
   vr_shell_gl_ = std::make_unique<VrShellGl>(
       this, std::move(ui), gvr_api_, reprojected_rendering_, daydream_support_,
       ui_initial_state_.in_web_vr, pause_content_);
@@ -275,8 +271,9 @@ void VrGLThread::StopAutocomplete() {
 }
 
 void VrGLThread::LoadAssets() {
-  AssetsLoader::GetInstance()->Load(
-      base::BindOnce(&VrGLThread::OnAssetsLoaded, base::Unretained(this)));
+  DCHECK(OnGlThread());
+  main_thread_task_runner_->PostTask(
+      FROM_HERE, base::BindOnce(&VrShell::LoadAssets, weak_vr_shell_));
 }
 
 void VrGLThread::SetFullscreen(bool enabled) {
@@ -417,6 +414,23 @@ void VrGLThread::OnAssetsComponentReady() {
                                 weak_browser_ui_));
 }
 
+void VrGLThread::OnAssetsLoaded(AssetsLoadStatus status,
+                                std::unique_ptr<Assets> assets,
+                                const base::Version& component_version) {
+  DCHECK(OnMainThread());
+  task_runner()->PostTask(
+      FROM_HERE,
+      base::BindOnce(&BrowserUiInterface::OnAssetsLoaded, weak_browser_ui_,
+                     status, std::move(assets), component_version));
+}
+
+void VrGLThread::OnAssetsUnavailable() {
+  DCHECK(OnMainThread());
+  task_runner()->PostTask(
+      FROM_HERE, base::BindOnce(&BrowserUiInterface::OnAssetsUnavailable,
+                                weak_browser_ui_));
+}
+
 void VrGLThread::ShowSoftInput(bool show) {
   DCHECK(OnMainThread());
   task_runner()->PostTask(FROM_HERE,
@@ -443,13 +457,4 @@ bool VrGLThread::OnGlThread() const {
   return task_runner()->BelongsToCurrentThread();
 }
 
-void VrGLThread::OnAssetsLoaded(AssetsLoadStatus status,
-                                std::unique_ptr<Assets> assets,
-                                const base::Version& component_version) {
-  vr_shell_gl_->OnAssetsLoaded(status, std::move(assets), component_version);
-  main_thread_task_runner_->PostTask(
-      FROM_HERE, base::BindOnce(&VrShell::OnAssetsLoaded, weak_vr_shell_,
-                                status, component_version));
-}
-
 }  // namespace vr

chrome/browser/android/vr/vr_gl_thread.h

@@ -110,6 +110,10 @@ class VrGLThread : public base::android::JavaHandlerThread,
   void SetOmniboxSuggestions(
       std::unique_ptr<OmniboxSuggestions> result) override;
   void OnAssetsComponentReady() override;
+  void OnAssetsLoaded(AssetsLoadStatus status,
+                      std::unique_ptr<Assets> assets,
+                      const base::Version& component_version) override;
+  void OnAssetsUnavailable() override;
   void ShowSoftInput(bool show) override;
   void UpdateWebInputIndices(int selection_start,
                              int selection_end,
@@ -124,10 +128,6 @@ class VrGLThread : public base::android::JavaHandlerThread,
   bool OnMainThread() const;
   bool OnGlThread() const;
 
-  void OnAssetsLoaded(AssetsLoadStatus status,
-                      std::unique_ptr<Assets> assets,
-                      const base::Version& component_version);
-
   // Created on GL thread.
   std::unique_ptr<VrShellGl> vr_shell_gl_;
   std::unique_ptr<GvrKeyboardDelegate> keyboard_delegate_;

chrome/browser/android/vr/vr_shell.cc

@@ -35,6 +35,7 @@
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/vr/assets_loader.h"
 #include "chrome/browser/vr/metrics_helper.h"
+#include "chrome/browser/vr/model/assets.h"
 #include "chrome/browser/vr/model/omnibox_suggestions.h"
 #include "chrome/browser/vr/model/text_input_info.h"
 #include "chrome/browser/vr/toolbar_helper.h"
@@ -87,6 +88,9 @@ constexpr base::TimeDelta poll_media_access_interval_ =
 constexpr base::TimeDelta kExitVrDueToUnsupportedModeDelay =
     base::TimeDelta::FromSeconds(5);
 
+constexpr base::TimeDelta kAssetsComponentWaitDelay =
+    base::TimeDelta::FromSeconds(2);
+
 static constexpr float kInchesToMeters = 0.0254f;
 // Screen pixel density of the Google Pixel phone in pixels per inch.
 static constexpr float kPixelPpi = 441.0f;
@@ -144,6 +148,7 @@ VrShell::VrShell(JNIEnv* env,
       reprojected_rendering_(reprojected_rendering),
       display_size_meters_(display_width_meters, display_height_meters),
       display_size_pixels_(display_width_pixels, display_height_pixels),
+      waiting_for_assets_component_timer_(false, false),
       weak_ptr_factory_(this) {
   DVLOG(1) << __FUNCTION__ << "=" << this;
   DCHECK(g_vr_shell_instance == nullptr);
@@ -168,6 +173,15 @@ VrShell::VrShell(JNIEnv* env,
                           ui_initial_state.web_vr_autopresentation_expected);
   }
 
+  if (AssetsLoader::GetInstance()->ComponentReady()) {
+    LoadAssets();
+  } else {
+    waiting_for_assets_component_timer_.Start(
+        FROM_HERE, kAssetsComponentWaitDelay,
+        base::BindRepeating(&VrShell::OnAssetsComponentWaitTimeout,
+                            weak_ptr_factory_.GetWeakPtr()));
+  }
+
   AssetsLoader::GetInstance()->SetOnComponentReadyCallback(base::BindRepeating(
       &VrShell::OnAssetsComponentReady, weak_ptr_factory_.GetWeakPtr()));
   AssetsLoader::GetInstance()->GetMetricsHelper()->OnEnter(Mode::kVr);
@@ -991,8 +1005,16 @@ void VrShell::OnVoiceResults(const base::string16& result) {
       base::android::ConvertUTF8ToJavaString(env, url.spec()));
 }
 
+void VrShell::LoadAssets() {
+  AssetsLoader::GetInstance()->Load(
+      base::BindOnce(&VrShell::OnAssetsLoaded, base::Unretained(this)));
+}
+
 void VrShell::OnAssetsLoaded(AssetsLoadStatus status,
+                             std::unique_ptr<Assets> assets,
                              const base::Version& component_version) {
+  ui_->OnAssetsLoaded(status, std::move(assets), component_version);
+
   if (status == AssetsLoadStatus::kSuccess) {
     VLOG(1) << "Successfully loaded VR assets component";
   } else {
@@ -1004,7 +1026,16 @@ void VrShell::OnAssetsLoaded(AssetsLoadStatus status,
 }
 
 void VrShell::OnAssetsComponentReady() {
-  ui_->OnAssetsComponentReady();
+  if (waiting_for_assets_component_timer_.IsRunning()) {
+    waiting_for_assets_component_timer_.Stop();
+    LoadAssets();
+  } else {
+    ui_->OnAssetsComponentReady();
+  }
+}
+
+void VrShell::OnAssetsComponentWaitTimeout() {
+  ui_->OnAssetsUnavailable();
 }
 
 void VrShell::AcceptDoffPromptForTesting(
@@ -1044,8 +1075,7 @@ jlong JNI_VrShellImpl_Init(JNIEnv* env,
       has_or_can_request_audio_permission;
   ui_initial_state.skips_redraw_when_not_dirty =
       base::FeatureList::IsEnabled(features::kVrBrowsingExperimentalRendering);
-  ui_initial_state.assets_available =
-      AssetsLoader::GetInstance()->ComponentReady();
+  ui_initial_state.assets_available = true;
 
   return reinterpret_cast<intptr_t>(new VrShell(
       env, obj, ui_initial_state,

chrome/browser/android/vr/vr_shell.h

@@ -223,7 +223,9 @@ class VrShell : device::GvrGamepadDataProvider,
 
   void OnVoiceResults(const base::string16& result) override;
 
+  void LoadAssets();
   void OnAssetsLoaded(AssetsLoadStatus status,
+                      std::unique_ptr<Assets> assets,
                       const base::Version& component_version);
 
   void AcceptDoffPromptForTesting(
@@ -246,6 +248,7 @@ class VrShell : device::GvrGamepadDataProvider,
   content::WebContents* GetNonNativePageWebContents() const;
 
   void OnAssetsComponentReady();
+  void OnAssetsComponentWaitTimeout();
 
   bool vr_shell_enabled_;
 
@@ -312,6 +315,8 @@ class VrShell : device::GvrGamepadDataProvider,
   gl::SurfaceTexture* overlay_surface_texture_ = nullptr;
   gl::SurfaceTexture* ui_surface_texture_ = nullptr;
 
+  base::Timer waiting_for_assets_component_timer_;
+
   base::WeakPtrFactory<VrShell> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VrShell);

chrome/browser/android/vr/vr_shell_gl.cc

@@ -458,12 +458,6 @@ void VrShellGl::OnSwapContents(int new_content_id) {
   ui_->OnSwapContents(new_content_id);
 }
 
-void VrShellGl::OnAssetsLoaded(AssetsLoadStatus status,
-                               std::unique_ptr<Assets> assets,
-                               const base::Version& component_version) {
-  ui_->OnAssetsLoaded(status, std::move(assets), component_version);
-}
-
 void VrShellGl::EnableAlertDialog(ContentInputForwarder* input_forwarder,
                                   int width,
                                   int height) {

chrome/browser/android/vr/vr_shell_gl.h

@@ -18,7 +18,6 @@
 #include "chrome/browser/android/vr/android_vsync_helper.h"
 #include "chrome/browser/android/vr/vr_controller.h"
 #include "chrome/browser/android/vr/vr_dialog.h"
-#include "chrome/browser/vr/assets_load_status.h"
 #include "chrome/browser/vr/content_input_delegate.h"
 #include "chrome/browser/vr/fps_meter.h"
 #include "chrome/browser/vr/model/controller_model.h"
@@ -34,10 +33,6 @@
 #include "ui/gfx/geometry/size_f.h"
 #include "ui/gfx/native_widget_types.h"
 
-namespace base {
-class Version;
-}  // namespace base
-
 namespace gl {
 class GLContext;
 class GLFenceEGL;
@@ -60,7 +55,6 @@ class SlidingTimeDeltaAverage;
 class Ui;
 class VrController;
 class VrShell;
-struct Assets;
 
 struct WebVrBounds {
   WebVrBounds(const gfx::RectF& left,
@@ -119,10 +113,6 @@ class VrShellGl : public device::mojom::VRPresentationProvider {
 
   void OnSwapContents(int new_content_id);
 
-  void OnAssetsLoaded(AssetsLoadStatus status,
-                      std::unique_ptr<Assets> assets,
-                      const base::Version& component_version);
-
   void EnableAlertDialog(ContentInputForwarder* input_forwarder,
                          int width,
                          int height);

chrome/browser/vr/browser_ui_interface.h

@@ -5,11 +5,17 @@
 #ifndef CHROME_BROWSER_VR_BROWSER_UI_INTERFACE_H_
 #define CHROME_BROWSER_VR_BROWSER_UI_INTERFACE_H_
 
+#include "chrome/browser/vr/assets_load_status.h"
 #include "chrome/browser/vr/ui_unsupported_mode.h"
 #include "components/security_state/core/security_state.h"
 
+namespace base {
+class Version;
+}  // namespace base
+
 namespace vr {
 
+struct Assets;
 struct OmniboxSuggestions;
 struct ToolbarState;
 
@@ -39,6 +45,10 @@ class BrowserUiInterface {
   virtual void SetOmniboxSuggestions(
       std::unique_ptr<OmniboxSuggestions> suggestions) = 0;
   virtual void OnAssetsComponentReady() = 0;
+  virtual void OnAssetsLoaded(AssetsLoadStatus status,
+                              std::unique_ptr<Assets> assets,
+                              const base::Version& component_version) = 0;
+  virtual void OnAssetsUnavailable() = 0;
 
   // Web contents text input related.
   virtual void ShowSoftInput(bool show) = 0;

chrome/browser/vr/model/model.h

@@ -45,7 +45,7 @@ struct Model {
   UiElementRenderer::TextureLocation content_overlay_location =
       UiElementRenderer::kTextureLocationLocal;
   bool update_ready_snackbar_enabled = false;
-  bool background_available = false;
+  bool waiting_for_background = true;
   bool can_apply_new_background = false;
   bool background_loaded = false;
   bool supports_selection = true;

chrome/browser/vr/test/mock_browser_ui_interface.h

@@ -7,6 +7,7 @@
 
 #include "base/macros.h"
 #include "chrome/browser/vr/browser_ui_interface.h"
+#include "chrome/browser/vr/model/assets.h"
 #include "chrome/browser/vr/model/omnibox_suggestions.h"
 #include "chrome/browser/vr/model/toolbar_state.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -38,6 +39,10 @@ class MockBrowserUiInterface : public BrowserUiInterface {
   MOCK_METHOD1(OnSpeechRecognitionStateChanged, void(int new_state));
   void SetOmniboxSuggestions(std::unique_ptr<OmniboxSuggestions> suggestions) {}
   MOCK_METHOD0(OnAssetsComponentReady, void());
+  void OnAssetsLoaded(AssetsLoadStatus status,
+                      std::unique_ptr<Assets> assets,
+                      const base::Version& component_version) {}
+  MOCK_METHOD0(OnAssetsUnavailable, void());
 
   MOCK_METHOD1(ShowSoftInput, void(bool));
   MOCK_METHOD4(UpdateWebInputIndices, void(int, int, int, int));

chrome/browser/vr/testapp/vr_test_context.cc

@@ -89,12 +89,9 @@ VrTestContext::VrTestContext() : view_scale_factor_(kDefaultViewScaleFactor) {
   keyboard_delegate_ = std::make_unique<TestKeyboardDelegate>();
 
   UiInitialState ui_initial_state;
-  ui_initial_state.assets_available = true;
   ui_ = std::make_unique<Ui>(this, nullptr, keyboard_delegate_.get(),
                              text_input_delegate_.get(), ui_initial_state);
-  if (ui_initial_state.assets_available) {
-    LoadAssets();
-  }
+  LoadAssets();
 
   text_input_delegate_->SetRequestFocusCallback(
       base::BindRepeating(&vr::Ui::RequestFocus, base::Unretained(ui_.get())));