Adding compositor callbacks to RenderWidgetHostViewAndroid

content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java

Index: content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
index cb00d167ab2e620d91dfcf06813e6f4d07b7785e..1b537070acbefc12f37fa39f486f12cc37b16a67 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
@@ -725,7 +725,7 @@ public class ContentViewCore
     // deleting it after destroying the ContentViewCore.
     public void initialize(ViewGroup containerView, InternalAccessDelegate internalDispatcher,
             int nativeWebContents, WindowAndroid windowAndroid,
-            int inputEventDeliveryMode) {
+            CompositorProvider compositorProvider, int inputEventDeliveryMode) {
         // Check whether to use hardware acceleration. This is a bit hacky, and
         // only works if the Context is actually an Activity (as it is in the
         // Chrome application).
@@ -760,8 +760,11 @@ public class ContentViewCore
             viewAndroidNativePointer = mViewAndroid.getNativePointer();
         }
 
-        mNativeContentViewCore = nativeInit(mHardwareAccelerated,
-                nativeWebContents, viewAndroidNativePointer, windowNativePointer);
+        int compositorProviderNativePointer = compositorProvider != null ?
+                compositorProvider.getNativeCompositorProvider() : 0;
+
+        mNativeContentViewCore = nativeInit(mHardwareAccelerated, nativeWebContents,
+                viewAndroidNativePointer, windowNativePointer, compositorProviderNativePointer);
         mContentSettings = new ContentSettings(this, mNativeContentViewCore);
         initializeContainerView(internalDispatcher, inputEventDeliveryMode);
 
@@ -3208,7 +3211,7 @@ public class ContentViewCore
     }
 
     private native int nativeInit(boolean hardwareAccelerated, int webContentsPtr,
-            int viewAndroidPtr, int windowAndroidPtr);
+            int viewAndroidPtr, int windowAndroidPtr, int compositorProviderPtr);
 
     @CalledByNative
     private ContentVideoViewClient getContentVideoViewClient() {