VR: Remove UI wrappers in BrowserRenderer

These methods don't affect the BrowserRenderer. The task posting is done
in VrGLThread instead.

Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:linux_vr;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: Ie43b046c71b7293d33316f4029f0fd7710c19869
Reviewed-on: https://chromium-review.googlesource.com/c/1258283
Commit-Queue: Aldo Culquicondor <acondor@chromium.org>
Reviewed-by: Christopher Grant <cjgrant@chromium.org>
Cr-Commit-Position: refs/heads/master@{#596219}

chrome/browser/android/vr/vr_gl_thread.cc

@@ -493,6 +493,43 @@ void VrGLThread::UpdateWebInputIndices(int selection_start,
                           composition_start, composition_end));
 }
 
+void VrGLThread::OnSwapContents(int new_content_id) {
+  task_runner()->PostTask(
+      FROM_HERE, base::BindRepeating(&BrowserUiInterface::OnSwapContents,
+                                     weak_browser_ui_, new_content_id));
+}
+
+void VrGLThread::SetDialogLocation(float x, float y) {
+  task_runner()->PostTask(
+      FROM_HERE, base::BindRepeating(&BrowserUiInterface::SetDialogLocation,
+                                     weak_browser_ui_, x, y));
+}
+
+void VrGLThread::SetDialogFloating(bool floating) {
+  task_runner()->PostTask(
+      FROM_HERE, base::BindRepeating(&BrowserUiInterface::SetDialogFloating,
+                                     weak_browser_ui_, floating));
+}
+
+void VrGLThread::ShowPlatformToast(const base::string16& text) {
+  task_runner()->PostTask(
+      FROM_HERE, base::BindRepeating(&BrowserUiInterface::ShowPlatformToast,
+                                     weak_browser_ui_, text));
+}
+
+void VrGLThread::CancelPlatformToast() {
+  task_runner()->PostTask(
+      FROM_HERE, base::BindRepeating(&BrowserUiInterface::CancelPlatformToast,
+                                     weak_browser_ui_));
+}
+
+void VrGLThread::OnContentBoundsChanged(int width, int height) {
+  task_runner()->PostTask(
+      FROM_HERE,
+      base::BindRepeating(&BrowserUiInterface::OnContentBoundsChanged,
+                          weak_browser_ui_, width, height));
+}
+
 void VrGLThread::AddOrUpdateTab(int id,
                                 bool incognito,
                                 const base::string16& title) {

chrome/browser/android/vr/vr_gl_thread.h

@@ -147,6 +147,12 @@ class VrGLThread : public base::android::JavaHandlerThread,
                              int selection_end,
                              int composition_start,
                              int composition_end) override;
+  void OnSwapContents(int new_content_id) override;
+  void SetDialogLocation(float x, float y) override;
+  void SetDialogFloating(bool floating) override;
+  void ShowPlatformToast(const base::string16& text) override;
+  void CancelPlatformToast() override;
+  void OnContentBoundsChanged(int width, int height) override;
   void AddOrUpdateTab(int id,
                       bool incognito,
                       const base::string16& title) override;

chrome/browser/android/vr/vr_shell.cc

@@ -220,9 +220,7 @@ void VrShell::SwapContents(JNIEnv* env,
                            const JavaParamRef<jobject>& obj,
                            const JavaParamRef<jobject>& tab) {
   content_id_++;
-  PostToGlThread(FROM_HERE,
-                 base::BindOnce(&BrowserRenderer::OnSwapContents,
-                                gl_thread_->GetBrowserRenderer(), content_id_));
+  gl_thread_->OnSwapContents(content_id_);
   TabAndroid* active_tab =
       tab.is_null()
           ? nullptr
@@ -673,17 +671,13 @@ void VrShell::SetDialogLocation(JNIEnv* env,
                                 const base::android::JavaParamRef<jobject>& obj,
                                 float x,
                                 float y) {
-  PostToGlThread(FROM_HERE,
-                 base::BindOnce(&BrowserRenderer::SetDialogLocation,
-                                gl_thread_->GetBrowserRenderer(), x, y));
+  gl_thread_->SetDialogLocation(x, y);
 }
 
 void VrShell::SetDialogFloating(JNIEnv* env,
                                 const base::android::JavaParamRef<jobject>& obj,
                                 bool floating) {
-  PostToGlThread(FROM_HERE,
-                 base::BindOnce(&BrowserRenderer::SetDialogFloating,
-                                gl_thread_->GetBrowserRenderer(), floating));
+  gl_thread_->SetDialogFloating(floating);
 }
 
 void VrShell::ShowToast(JNIEnv* env,
@@ -691,15 +685,12 @@ void VrShell::ShowToast(JNIEnv* env,
                         jstring jtext) {
   base::string16 text;
   base::android::ConvertJavaStringToUTF16(env, jtext, &text);
-  PostToGlThread(FROM_HERE,
-                 base::BindOnce(&BrowserRenderer::ShowToast,
-                                gl_thread_->GetBrowserRenderer(), text));
+  gl_thread_->ShowPlatformToast(text);
 }
 
 void VrShell::CancelToast(JNIEnv* env,
                           const base::android::JavaParamRef<jobject>& obj) {
-  PostToGlThread(FROM_HERE, base::BindOnce(&BrowserRenderer::CancelToast,
-                                           gl_thread_->GetBrowserRenderer()));
+  gl_thread_->CancelPlatformToast();
 }
 
 void VrShell::ConnectPresentingService(
@@ -952,10 +943,7 @@ void VrShell::OnContentScreenBoundsChanged(const gfx::SizeF& bounds) {
   Java_VrShell_setContentCssSize(env, j_vr_shell_, window_size.width(),
                                  window_size.height(), dpr);
 
-  PostToGlThread(FROM_HERE,
-                 base::BindOnce(&BrowserRenderer::ContentBoundsChanged,
-                                gl_thread_->GetBrowserRenderer(),
-                                window_size.width(), window_size.height()));
+  gl_thread_->OnContentBoundsChanged(window_size.width(), window_size.height());
 }
 
 void VrShell::SetVoiceSearchActive(bool active) {

chrome/browser/vr/browser_renderer.cc

@@ -158,10 +158,6 @@ void BrowserRenderer::SetWebXrMode(bool enabled) {
   scheduler_delegate_->SetWebXrMode(enabled);
 }
 
-void BrowserRenderer::OnSwapContents(int new_content_id) {
-  ui_->OnSwapContents(new_content_id);
-}
-
 void BrowserRenderer::EnableAlertDialog(PlatformInputHandler* input_handler,
                                         float width,
                                         float height) {
@@ -206,31 +202,10 @@ void BrowserRenderer::SetAlertDialogSize(float width, float height) {
   }
 }
 
-void BrowserRenderer::SetDialogLocation(float x, float y) {
-  ui_->SetDialogLocation(x, y);
-}
-
-void BrowserRenderer::SetDialogFloating(bool floating) {
-  ui_->SetDialogFloating(floating);
-}
-
-void BrowserRenderer::ShowToast(const base::string16& text) {
-  ui_->ShowPlatformToast(text);
-}
-
-void BrowserRenderer::CancelToast() {
-  ui_->CancelPlatformToast();
-}
-
 void BrowserRenderer::ResumeContentRendering() {
   graphics_delegate_->ResumeContentRendering();
 }
 
-void BrowserRenderer::ContentBoundsChanged(int width, int height) {
-  TRACE_EVENT0("gpu", __func__);
-  ui_->OnContentBoundsChanged(width, height);
-}
-
 void BrowserRenderer::BufferBoundsChanged(
     const gfx::Size& content_buffer_size,
     const gfx::Size& overlay_buffer_size) {

chrome/browser/vr/browser_renderer.h

@@ -58,18 +58,12 @@ class VR_EXPORT BrowserRenderer : public SchedulerBrowserRendererInterface {
   void OnExitPresent();
   void OnTriggerEvent(bool pressed);
   void SetWebXrMode(bool enabled);
-  void OnSwapContents(int new_content_id);
   void EnableAlertDialog(PlatformInputHandler* input_handler,
                          float width,
                          float height);
   void DisableAlertDialog();
   void SetAlertDialogSize(float width, float height);
-  void SetDialogLocation(float x, float y);
-  void SetDialogFloating(bool floating);
-  void ShowToast(const base::string16& text);
-  void CancelToast();
   void ResumeContentRendering();
-  void ContentBoundsChanged(int width, int height);
   void BufferBoundsChanged(const gfx::Size& content_buffer_size,
                            const gfx::Size& overlay_buffer_size);
 

chrome/browser/vr/browser_renderer_unittest.cc

@@ -34,20 +34,12 @@ class MockUi : public UiInterface {
       void(GlTextureLocation, unsigned int, unsigned int, unsigned int));
   MOCK_METHOD4(SetAlertDialogEnabled,
                void(bool, PlatformUiInputDelegate*, float, float));
-  MOCK_METHOD2(SetAlertDialogSize, void(float, float));
   MOCK_METHOD4(SetContentOverlayAlertDialogEnabled,
                void(bool, PlatformUiInputDelegate*, float, float));
-  MOCK_METHOD2(SetDialogLocation, void(float, float));
-  MOCK_METHOD2(SetContentOverlayAlertDialogSize, void(float, float));
-  MOCK_METHOD1(SetDialogFloating, void(bool));
-  MOCK_METHOD1(ShowPlatformToast, void(const base::string16&));
-  MOCK_METHOD0(CancelPlatformToast, void());
   MOCK_METHOD0(OnPause, void());
   void OnControllerUpdated(const ControllerModel&,
                            const ReticleModel&) override {}
   void OnProjMatrixChanged(const gfx::Transform&) override {}
-  MOCK_METHOD1(OnSwapContents, void(int));
-  MOCK_METHOD2(OnContentBoundsChanged, void(int, int));
   MOCK_METHOD0(AcceptDoffPromptForTesting, void());
   MOCK_METHOD2(GetTargetPointForTesting,
                gfx::Point3F(UserFriendlyElementName,

chrome/browser/vr/browser_ui_interface.h

@@ -24,6 +24,8 @@ struct OmniboxSuggestions;
 struct ToolbarState;
 
 // The browser communicates state changes to the VR UI via this interface.
+// A GL thread would also implement this interface to provide a convenient way
+// to call these methods from the main thread.
 class VR_EXPORT BrowserUiInterface {
  public:
   virtual ~BrowserUiInterface() {}
@@ -57,6 +59,12 @@ class VR_EXPORT BrowserUiInterface {
                                      int selection_end,
                                      int composition_start,
                                      int composition_end) = 0;
+  virtual void OnSwapContents(int new_content_id) = 0;
+  virtual void SetDialogLocation(float x, float y) = 0;
+  virtual void SetDialogFloating(bool floating) = 0;
+  virtual void ShowPlatformToast(const base::string16& text) = 0;
+  virtual void CancelPlatformToast() = 0;
+  virtual void OnContentBoundsChanged(int width, int height) = 0;
   virtual void AddOrUpdateTab(int id,
                               bool incognito,
                               const base::string16& title) = 0;

chrome/browser/vr/test/mock_browser_ui_interface.h

@@ -46,6 +46,12 @@ class MockBrowserUiInterface : public BrowserUiInterface {
   MOCK_METHOD1(SetOverlayTextureEmpty, void(bool));
   MOCK_METHOD1(ShowSoftInput, void(bool));
   MOCK_METHOD4(UpdateWebInputIndices, void(int, int, int, int));
+  MOCK_METHOD1(OnSwapContents, void(int));
+  MOCK_METHOD2(SetDialogLocation, void(float, float));
+  MOCK_METHOD1(SetDialogFloating, void(bool));
+  MOCK_METHOD1(ShowPlatformToast, void(const base::string16&));
+  MOCK_METHOD0(CancelPlatformToast, void());
+  MOCK_METHOD2(OnContentBoundsChanged, void(int, int));
   MOCK_METHOD3(AddOrUpdateTab,
                void(int id, bool incognito, const base::string16& title));
   MOCK_METHOD2(RemoveTab, void(int id, bool incognito));

chrome/browser/vr/testapp/vr_test_context.cc

@@ -228,9 +228,9 @@ void VrTestContext::HandleInput(ui::Event* event) {
         break;
       case ui::DomCode::US_A:
         if (model_->platform_toast) {
-          ui_->CancelPlatformToast();
+          browser_ui->CancelPlatformToast();
         } else {
-          ui_->ShowPlatformToast(base::UTF8ToUTF16("Downloading"));
+          browser_ui->ShowPlatformToast(base::UTF8ToUTF16("Downloading"));
         }
         break;
       case ui::DomCode::US_H:

chrome/browser/vr/ui.h

@@ -137,9 +137,6 @@ class VR_UI_EXPORT Ui : public UiInterface,
                                            PlatformUiInputDelegate* delegate,
                                            float width_percentage,
                                            float height_percentage) override;
-  void SetAlertDialogSize(float width, float height) override;
-  void SetContentOverlayAlertDialogSize(float width_percentage,
-                                        float height_percentage) override;
   void SetDialogLocation(float x, float y) override;
   void SetDialogFloating(bool floating) override;
   void ShowPlatformToast(const base::string16& text) override;
@@ -198,6 +195,9 @@ class VR_UI_EXPORT Ui : public UiInterface,
   void OnKeyboardHidden() override;
 
  private:
+  void SetAlertDialogSize(float width, float height);
+  void SetContentOverlayAlertDialogSize(float width_percentage,
+                                        float height_percentage);
   void RequestFocus(int element_id);
   void RequestUnfocus(int element_id);
   void OnMenuButtonClicked();

chrome/browser/vr/ui_interface.h

@@ -62,19 +62,10 @@ class UiInterface {
       PlatformUiInputDelegate* delegate,
       float width_percentage,
       float height_percentage) = 0;
-  virtual void SetAlertDialogSize(float width, float height) = 0;
-  virtual void SetContentOverlayAlertDialogSize(float width_percentage,
-                                                float height_percentage) = 0;
-  virtual void SetDialogLocation(float x, float y) = 0;
-  virtual void SetDialogFloating(bool floating) = 0;
-  virtual void ShowPlatformToast(const base::string16& text) = 0;
-  virtual void CancelPlatformToast() = 0;
   virtual void OnPause() = 0;
   virtual void OnControllerUpdated(const ControllerModel& controller_model,
                                    const ReticleModel& reticle_model) = 0;
   virtual void OnProjMatrixChanged(const gfx::Transform& proj_matrix) = 0;
-  virtual void OnSwapContents(int new_content_id) = 0;
-  virtual void OnContentBoundsChanged(int width, int height) = 0;
   virtual void AcceptDoffPromptForTesting() = 0;
   virtual gfx::Point3F GetTargetPointForTesting(
       UserFriendlyElementName element_name,

chrome/browser/vr/ui_unittest.cc

@@ -150,23 +150,24 @@ TEST_F(UiTest, WebVrToastTransience) {
 TEST_F(UiTest, PlatformToast) {
   CreateScene(kNotInWebVr);
   EXPECT_FALSE(IsVisible(kPlatformToast));
+  auto browser_ui = ui_->GetBrowserUiWeakPtr();
 
   // show and hide toast after a timeout.
-  ui_->ShowPlatformToast(base::UTF8ToUTF16("Downloading"));
+  browser_ui->ShowPlatformToast(base::UTF8ToUTF16("Downloading"));
   EXPECT_TRUE(IsVisible(kPlatformToast));
   EXPECT_TRUE(RunForSeconds(kToastTimeoutSeconds + kSmallDelaySeconds));
   EXPECT_FALSE(IsVisible(kPlatformToast));
 
   // toast can be cancelled.
-  ui_->ShowPlatformToast(base::UTF8ToUTF16("Downloading"));
+  browser_ui->ShowPlatformToast(base::UTF8ToUTF16("Downloading"));
   EXPECT_TRUE(IsVisible(kPlatformToast));
-  ui_->CancelPlatformToast();
+  browser_ui->CancelPlatformToast();
   EXPECT_FALSE(IsVisible(kPlatformToast));
 
   // toast can refresh visible timeout.
-  ui_->ShowPlatformToast(base::UTF8ToUTF16("Downloading"));
+  browser_ui->ShowPlatformToast(base::UTF8ToUTF16("Downloading"));
   EXPECT_TRUE(RunForSeconds(kSmallDelaySeconds));
-  ui_->ShowPlatformToast(base::UTF8ToUTF16("Downloading"));
+  browser_ui->ShowPlatformToast(base::UTF8ToUTF16("Downloading"));
   EXPECT_TRUE(RunForSeconds(kToastTimeoutSeconds - kSmallDelaySeconds));
   EXPECT_TRUE(IsVisible(kPlatformToast));
   EXPECT_TRUE(RunForSeconds(kToastTimeoutSeconds + kSmallDelaySeconds));