Remove Sync GetPose VRService call, implement VRVSyncProvider

chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.vr_shell;
 
 import android.app.Activity;
 import android.app.PendingIntent;
 import android.content.ComponentName;
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.os.Handler;
 import android.os.StrictMode;
 import android.os.SystemClock;
 import android.support.annotation.IntDef;
+import android.view.Choreographer;
+import android.view.Choreographer.FrameCallback;
+import android.view.Display;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
 import android.view.WindowManager;
 import android.widget.FrameLayout;
 
 import org.chromium.base.Log;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
@@ skipping 137 matching lines @@
         mVrSupportLevel = mVrDaydreamApi.isDaydreamReadyDevice() ? VR_DAYDREAM : VR_CARDBOARD;
     }
 
     /**
      * Should be called once the native library is loaded so that the native portion of this class
      * can be initialized.
      */
     public void onNativeLibraryReady() {
         if (mVrSupportLevel == VR_NOT_AVAILABLE) return;
         mNativeVrShellDelegate = nativeInit();
+        Choreographer choreographer = Choreographer.getInstance();
+        choreographer.postFrameCallback(new FrameCallback() {
+            @Override
+            public void doFrame(long frameTimeNanos) {
+                Display display = ((WindowManager) mActivity.getSystemService(
+                        Context.WINDOW_SERVICE)).getDefaultDisplay();
+                nativeUpdateVSyncInterval(mNativeVrShellDelegate, frameTimeNanos,
+                        1.0d / display.getRefreshRate());
+            }
+        });
     }
 
     @SuppressWarnings("unchecked")
     private VrClassesWrapper createVrClassesWrapper() {
         try {
             Class<? extends VrClassesWrapper> vrClassesBuilderClass =
                     (Class<? extends VrClassesWrapper>) Class.forName(
                             "org.chromium.chrome.browser.vr_shell.VrClassesWrapperImpl");
             Constructor<?> vrClassesBuilderConstructor =
                     vrClassesBuilderClass.getConstructor(Activity.class);
@@ skipping 213 matching lines @@
         // If this is still set, it means the user backed out of the DON flow, and we won't be
         // receiving an intent from daydream.
         if (mRequestedWebVR) {
             nativeSetPresentResult(mNativeVrShellDelegate, false);
             mRequestedWebVR = false;
         }
 
         // TODO(bshe): Ideally, we do not need two gvr context exist at the same time. We can
         // probably shutdown non presenting gvr when presenting and create a new one after exit
         // presenting. See crbug.com/655242
-        if (mNonPresentingGvrContext != null) {
-            StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites();
-            try {
-                mNonPresentingGvrContext.resume();
-            } catch (IllegalArgumentException e) {
-                Log.e(TAG, "Unable to resume mNonPresentingGvrContext", e);
-            } finally {
-                StrictMode.setThreadPolicy(oldPolicy);
-            }
+        StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites();
+        try {
+            nativeOnResume(mNativeVrShellDelegate);
+        } finally {
+            StrictMode.setThreadPolicy(oldPolicy);
         }
 
         if (mInVr) {
             setupVrModeWindowFlags();
-            StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites();
+            oldPolicy = StrictMode.allowThreadDiskWrites();
             try {
                 mVrShell.resume();
             } catch (IllegalArgumentException e) {
                 Log.e(TAG, "Unable to resume VrShell", e);
             } finally {
                 StrictMode.setThreadPolicy(oldPolicy);
             }
         } else if (mVrSupportLevel == VR_DAYDREAM && mVrDaydreamApi.isDaydreamCurrentViewer()
                 && mLastVRExit + REENTER_VR_TIMEOUT_MS > SystemClock.uptimeMillis()) {
             enterVRIfNecessary();
@@ skipping 11 matching lines @@
 
             // When the active web page has a vrdisplayactivate event handler,
             // mListeningForWebVrActivate should be set to true, which means a vrdisplayactive event
             // should be fired once DON flow finished. However, DON flow will pause our activity,
             // which makes the active page becomes invisible. And the event fires before the active
             // page becomes visible again after DON finished. So here we remember the value of
             // mListeningForWebVrActivity before pause and use this value to decide if
             // vrdisplayactivate event should be dispatched in enterVRFromIntent.
             mListeningForWebVrActivateBeforePause = mListeningForWebVrActivate;
         }
-        if (mNonPresentingGvrContext != null) {
-            mNonPresentingGvrContext.pause();
-        }
+        nativeOnPause(mNativeVrShellDelegate);
 
         // TODO(mthiesse): When VR Shell lives in its own activity, and integrates with Daydream
         // home, pause instead of exiting VR here. For now, because VR Apps shouldn't show up in the
         // non-VR recents, and we don't want ChromeTabbedActivity disappearing, exit VR.
         exitVRIfNecessary(true);
     }
 
     /**
      * Exits the current VR mode (WebVR or VRShell)
      * @return Whether or not we exited VR.
@@ skipping 185 matching lines @@
      * @return Pointer to the native VrShellDelegate object.
      */
     @CalledByNative
     private long getNativePointer() {
         return mNativeVrShellDelegate;
     }
 
     private native long nativeInit();
     private native void nativeSetPresentResult(long nativeVrShellDelegate, boolean result);
     private native void nativeDisplayActivate(long nativeVrShellDelegate);
+    private native void nativeUpdateVSyncInterval(long nativeVrShellDelegate, long timebaseNanos,
+            double intervalSeconds);
+    private native void nativeOnPause(long nativeVrShellDelegate);
+    private native void nativeOnResume(long nativeVrShellDelegate);
 }