The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/8c2f6b3dd7a06a5f9ede992f3fe1a433397ba59b

commit 8c2f6b3dd7a06a5f9ede992f3fe1a433397ba59b
Author: Ian Vollick <vollick@chromium.org>
Date: Wed Dec 13 00:16:16 2017

[vr] Cancel webvr timeouts when exiting presentation

Previously, we'd leave presentation but the timeouts would still be
active. This could result in the timeout UI showing, even when using the
2D browsing UI.

Bug:  794297 
Change-Id: I89ba432f00cd27ae585f15a560d5212efca8798b
Reviewed-on: https://chromium-review.googlesource.com/823155
Commit-Queue: Ian Vollick <vollick@chromium.org>
Reviewed-by: Michael Thiessen <mthiesse@chromium.org>
Cr-Commit-Position: refs/heads/master@{#523615}
[modify] https://crrev.com/8c2f6b3dd7a06a5f9ede992f3fe1a433397ba59b/chrome/browser/android/vr_shell/vr_gl_thread.cc
[modify] https://crrev.com/8c2f6b3dd7a06a5f9ede992f3fe1a433397ba59b/chrome/browser/android/vr_shell/vr_shell_gl.cc
[modify] https://crrev.com/8c2f6b3dd7a06a5f9ede992f3fe1a433397ba59b/chrome/browser/android/vr_shell/vr_shell_gl.h

This bug requires manual review: M64 has already been promoted to the beta branch, so this requires manual review
Please contact the milestone owner if you have questions.
Owners: cmasso@(Android), cmasso@(iOS), kbleicher@(ChromeOS), abdulsyed@(Desktop)

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot

I guess this would be affecting Android?

Please provide the rational as to why this should be merged into M64

@4, yes, that's right.
@5, without this change, our UI will become unusable if we leave VR presentation at the wrong time. The change is fairly trivial and only affects VR browsing, so I think that this is low risk.

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/168c2fcc2d217217d304749378e075254f3b6b4a

commit 168c2fcc2d217217d304749378e075254f3b6b4a
Author: Ian Vollick <vollick@chromium.org>
Date: Fri Dec 22 20:46:45 2017

[vr] Cancel webvr timeouts when exiting presentation

Previously, we'd leave presentation but the timeouts would still be
active. This could result in the timeout UI showing, even when using the
2D browsing UI.

TBR=vollick@chromium.org

(cherry picked from commit 8c2f6b3dd7a06a5f9ede992f3fe1a433397ba59b)

Bug:  794297 
Change-Id: I89ba432f00cd27ae585f15a560d5212efca8798b
Reviewed-on: https://chromium-review.googlesource.com/823155
Commit-Queue: Ian Vollick <vollick@chromium.org>
Reviewed-by: Michael Thiessen <mthiesse@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#523615}
Reviewed-on: https://chromium-review.googlesource.com/843164
Reviewed-by: Ian Vollick <vollick@chromium.org>
Cr-Commit-Position: refs/branch-heads/3282@{#345}
Cr-Branched-From: 5fdc0fab22ce7efd32532ee989b223fa12f8171e-refs/heads/master@{#520840}
[modify] https://crrev.com/168c2fcc2d217217d304749378e075254f3b6b4a/chrome/browser/android/vr_shell/vr_gl_thread.cc
[modify] https://crrev.com/168c2fcc2d217217d304749378e075254f3b6b4a/chrome/browser/android/vr_shell/vr_shell_gl.cc
[modify] https://crrev.com/168c2fcc2d217217d304749378e075254f3b6b4a/chrome/browser/android/vr_shell/vr_shell_gl.h

Ian, for the repro steps, what page should I use in step one? Thanks.

I don't think we currently have any. What you could do is throw a breakpoint in to pause the page when it's about to call submitFrame and simulate it that way.

We should create a set of error pages to test stuff like this.

 Issue 800076  tracks writing such a page.

Ian, could you confirm that the following is a good test case: (Anna created a test page in  bug 800076 )

1. Go to https://webvr.info/samples/test-slow-render.html?noFrames=true
2. Press enter VR button and insert device into headset
3. Verify that you see the following:

- spinner
- "The page isnt responding, you can wait for it to exit" msg
- an X "Exit" button

4. Press the X "Exit" button and verify ... (I'm a little confused here, because even if I went from 2D Chrome straight to WebVR, hitting the X button here takes me to Chrome VR. Should that be the case?)

... that the WebVR presentation returns to (2D mode or Chrome VR?). 

Thanks!

moving to M65 as this will not block M64 ("this" being to review/add a test case as indicated in c#13 above.

Yes, that page does the right thing. If it summons the spinner and page-not-responding UI, then you're good. Your question about whether we should return to 2D or VR browsing is a good, but separate, question. I'll follow up offline about that.

dbbrooks@: The current behavior (exiting to the VR browser) feels appropriate here. If the user wants to go back to 2D Chrome they must take the headset off and remove the phone anyway, at which point the Daydream platform has a well established convention for exiting the VR app. ("X" in the upper left corner.) Given that scenario is well supported by the default platform behavior I doubt you'll get many users confused about how to return to 2D. So it seems clear that if the user leaves the headset on they almost certainly want to continue using VR.