Suffix VrShell calls with which thread they're expected to be run on.

Suffix VrShell calls with which thread they're expected to be run on.

This change is only intended to improve readability and spot threading issues.

In the future we may replace the suffixes with CHECKs once the issues are fixed.

BUG=671302
Committed: https://crrev.com/0964056106e231da2363132eeb3d0d2358c06e7c
Cr-Commit-Position: refs/heads/master@{#436493}

[mthiesse, 2016-12-05 19:57:03]

mthiesse@chromium.org changed reviewers:
+ bshe@chromium.org, klausw@chromium.org

[mthiesse, 2016-12-05 19:57:04]

PTAL.

[bshe, 2016-12-05 21:54:03]

lgtm with a nit

https://codereview.chromium.org/2551983002/diff/1/chrome/browser/ui/webui/vr_...
File chrome/browser/ui/webui/vr_shell/vr_shell_ui_message_handler.cc (right):

https://codereview.chromium.org/2551983002/diff/1/chrome/browser/ui/webui/vr_...
chrome/browser/ui/webui/vr_shell/vr_shell_ui_message_handler.cc:54:
vr_shell_->GetUiInterfaceOnGL()->SetUiCommandHandler(this);
should this be OnUI? Or should there be a TODO? It is confusing that OnGL and
OnUI are both used in this function.

[mthiesse, 2016-12-05 22:03:58]

https://codereview.chromium.org/2551983002/diff/1/chrome/browser/ui/webui/vr_...
File chrome/browser/ui/webui/vr_shell/vr_shell_ui_message_handler.cc (right):

https://codereview.chromium.org/2551983002/diff/1/chrome/browser/ui/webui/vr_...
chrome/browser/ui/webui/vr_shell/vr_shell_ui_message_handler.cc:54:
vr_shell_->GetUiInterfaceOnGL()->SetUiCommandHandler(this);
On 2016/12/05 21:54:03, bshe wrote:
> should this be OnUI? Or should there be a TODO? It is confusing that OnGL and
> OnUI are both used in this function.

The TODO is on VrShell::GetUiInterfaceOnGL()

[mthiesse, 2016-12-05 22:07:41]

The CQ bit was checked by mthiesse@chromium.org

[commit-bot: I haz the power, 2016-12-05 22:08:15]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-12-05 22:46:22]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-12-05 22:46:23]

Failed to apply patch for
chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java:
While running git apply --index -p1;
  error: patch failed:
chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java:244
  error:
chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java:
patch does not apply

Patch:      
chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java
Index:
chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java
diff --git
a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java
b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java
index
093fd5e848f0dae07354187b74fb0c215472d54c..645cb415458f86af7f5b743c6352356767785767
100644
---
a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java
+++
b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java
@@ -192,8 +192,8 @@ public class VrShellDelegate {
         mTab.addObserver(mTabObserver);
         addVrViews();
         setupVrModeWindowFlags();
-        mVrShell.initializeNative(mTab, this, mRequestedWebVR);
-        mVrShell.setCloseButtonListener(new Runnable() {
+        mVrShell.initializeNativeOnUI(mTab, this, mRequestedWebVR);
+        mVrShell.setCloseButtonListenerOnUI(new Runnable() {
             @Override
             public void run() {
                 exitVRIfNecessary(true);
@@ -201,7 +201,7 @@ public class VrShellDelegate {
         });
         // onResume needs to be called on GvrLayout after initialization to
make sure DON flow work
         // properly.
-        mVrShell.resume();
+        mVrShell.resumeOnUI();
         mTab.updateFullscreenEnabledState();
         return true;
     }
@@ -244,7 +244,7 @@ public class VrShellDelegate {
         mRequestedWebVR = inWebVR;
         switch (enterVRIfNecessary()) {
             case ENTER_VR_NOT_NECESSARY:
-                mVrShell.setWebVrModeEnabled(true);
+                mVrShell.setWebVrModeEnabledOnUI(true);
                 nativeSetPresentResult(mNativeVrShellDelegate, true);
                 mRequestedWebVR = false;
                 break;
@@ -273,7 +273,7 @@ public class VrShellDelegate {
     @CalledByNative
     private boolean exitWebVR() {
         if (!mInVr) return false;
-        mVrShell.setWebVrModeEnabled(false);
+        mVrShell.setWebVrModeEnabledOnUI(false);
         // TODO(bajones): Once VR Shell can be invoked outside of WebVR this
         // should no longer exit the shell outright. Need a way to determine
         // how VrShell was created.
@@ -319,7 +319,7 @@ public class VrShellDelegate {
             setupVrModeWindowFlags();
             StrictMode.ThreadPolicy oldPolicy =
StrictMode.allowThreadDiskWrites();
             try {
-                mVrShell.resume();
+                mVrShell.resumeOnUI();
             } catch (IllegalArgumentException e) {
                 Log.e(TAG, "Unable to resume VrShell", e);
             } finally {
@@ -435,7 +435,7 @@ public class VrShellDelegate {
             mLastVRExit = SystemClock.uptimeMillis();
         }
         mActivity.setRequestedOrientation(mRestoreOrientation);
-        mVrShell.pause();
+        mVrShell.pauseOnUI();
         removeVrViews();
         clearVrModeWindowFlags();
         destroyVrShell();
@@ -475,14 +475,14 @@ public class VrShellDelegate {
         LayoutParams params = new FrameLayout.LayoutParams(
                 ViewGroup.LayoutParams.MATCH_PARENT,
                 ViewGroup.LayoutParams.MATCH_PARENT);
-        decor.addView(mVrShell.getContainer(), params);
+        decor.addView(mVrShell.getContainerOnUI(), params);
         mActivity.setUIVisibilityForVR(View.GONE);
     }
 
     private void removeVrViews() {
         mActivity.setUIVisibilityForVR(View.VISIBLE);
         FrameLayout decor = (FrameLayout) mActivity.getWindow().getDecorView();
-        decor.removeView(mVrShell.getContainer());
+        decor.removeView(mVrShell.getContainerOnUI());
     }
 
     private void setupVrModeWindowFlags() {
@@ -511,7 +511,7 @@ public class VrShellDelegate {
      */
     public void destroyVrShell() {
         if (mVrShell != null) {
-            mVrShell.teardown();
+            mVrShell.teardownOnUI();
             mVrShell = null;
         }
     }

[mthiesse, 2016-12-05 23:59:35]

The CQ bit was checked by mthiesse@chromium.org

[mthiesse, 2016-12-05 23:59:36]

The patchset sent to the CQ was uploaded after l-g-t-m from bshe@chromium.org
Link to the patchset: https://codereview.chromium.org/2551983002/#ps20001
(title: "Rebase")

[commit-bot: I haz the power, 2016-12-06 00:00:14]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-12-06 01:25:20]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-12-06 01:25:21]

Try jobs failed on following builders:
  android_n5x_swarming_rel on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/android_n5x_...)

[mthiesse, 2016-12-06 01:33:17]

The CQ bit was checked by mthiesse@chromium.org

[commit-bot: I haz the power, 2016-12-06 01:33:43]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-12-06 02:42:33]

CQ is committing da patch.

Bot data: {"patchset_id": 20001, "attempt_start_ts": 1480987997918690,
"parent_rev": "29a779ab266eec5109b65f02310d800b78784b1a", "commit_rev":
"e26058cb0dcadddea5a6bd6412f3b3c61793b7a0"}

[commit-bot: I haz the power, 2016-12-06 02:43:00]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2016-12-06 02:45:38]

Description was changed from

==========
Suffix VrShell calls with which thread they're expected to be run on.

This change is only intended to improve readability and spot threading issues.

In the future we may replace the suffixes with CHECKs once the issues are fixed.

BUG=671302
==========

to

==========
Suffix VrShell calls with which thread they're expected to be run on.

This change is only intended to improve readability and spot threading issues.

In the future we may replace the suffixes with CHECKs once the issues are fixed.

BUG=671302

Committed: https://crrev.com/0964056106e231da2363132eeb3d0d2358c06e7c
Cr-Commit-Position: refs/heads/master@{#436493}
==========

[commit-bot: I haz the power, 2016-12-06 02:45:39]

Patchset 2 (id:??) landed as
https://crrev.com/0964056106e231da2363132eeb3d0d2358c06e7c
Cr-Commit-Position: refs/heads/master@{#436493}