Android: Consolidate and simplify VSync logic

ui/android/java/src/org/chromium/ui/base/WindowAndroid.java

Index: ui/android/java/src/org/chromium/ui/base/WindowAndroid.java
diff --git a/ui/android/java/src/org/chromium/ui/base/WindowAndroid.java b/ui/android/java/src/org/chromium/ui/base/WindowAndroid.java
index 309b7355c2d2df6f104b0628030cd42c8b824398..c244de4f0b5f15003885ac25962bd5c8117eb97c 100644
--- a/ui/android/java/src/org/chromium/ui/base/WindowAndroid.java
+++ b/ui/android/java/src/org/chromium/ui/base/WindowAndroid.java
@@ -17,6 +17,7 @@ import android.widget.Toast;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
+import org.chromium.ui.VSyncMonitor;
 
 import java.lang.ref.WeakReference;
 import java.util.HashMap;
@@ -30,6 +31,8 @@ public class WindowAndroid {
 
     // Native pointer to the c++ WindowAndroid object.
     private long mNativeWindowAndroid = 0;
+    private final VSyncMonitor mVSyncMonitor;
+    private VSyncClient mVSyncClient = null;
 
     // A string used as a key to store intent errors in a bundle
     static final String WINDOW_CALLBACK_ERRORS = "window_callback_errors";
@@ -45,6 +48,15 @@ public class WindowAndroid {
     // the Android lint warning "UseSparseArrays".
     protected HashMap<Integer, String> mIntentErrors;
 
+    private final VSyncMonitor.Listener mVSyncListener = new VSyncMonitor.Listener() {
+       @Override public void onVSync(VSyncMonitor monitor,
+                                     long vsyncTimeMicros) {
+         if (mVSyncListener != null)
+           mVSyncClient.onVSync(vsyncTimeMicros);
+         nativeOnVSync(mNativeWindowAndroid, vsyncTimeMicros);
+       }
+    };
+
     /**
      * @param context The application context.
      */
@@ -54,6 +66,7 @@ public class WindowAndroid {
         mApplicationContext = context;
         mOutstandingIntents = new SparseArray<IntentCallback>();
         mIntentErrors = new HashMap<Integer, String>();
+        mVSyncMonitor = new VSyncMonitor(context, mVSyncListener);
     }
 
     /**
@@ -216,6 +229,31 @@ public class WindowAndroid {
     }
 
     /**
+     * An interface to receive VSync notifications from the window.
+     * The one and only client is set with setVSyncClient(client).
+     */
+    public interface VSyncClient {
+        public void onVSync(long vsyncTimeMicros);
+    }
+
+    /**
+     * Sets the VSyncClient.
+     */
+    public void setVSyncClient(VSyncClient client) {
+       assert mVSyncClient == null || client == null;
+       mVSyncClient = client;
+    }
+
+    @CalledByNative
+    /**
+     * Request a VSync callback.
+     * VSyncClient.onVSync() will be called at least once.
+     */
+    public void requestVSyncUpdate() {
+       mVSyncMonitor.requestUpdate();
+    }
+
+    /**
      * An interface that intent callback objects have to implement.
      */
     public interface IntentCallback {
@@ -257,7 +295,7 @@ public class WindowAndroid {
      */
     public long getNativePointer() {
         if (mNativeWindowAndroid == 0) {
-            mNativeWindowAndroid = nativeInit();
+            mNativeWindowAndroid = nativeInit(mVSyncMonitor.getVSyncPeriodInMicroseconds());
         }
         return mNativeWindowAndroid;
     }
@@ -271,7 +309,8 @@ public class WindowAndroid {
         return null;
     }
 
-    private native long nativeInit();
+    private native long nativeInit(long vsyncPeriod);
+    private native void nativeOnVSync(long nativeWindowAndroid, long vsyncTimeMicros);
     private native void nativeDestroy(long nativeWindowAndroid);
 
 }