Revert of android: Add draw completion for CompositorView

chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorView.java

Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorView.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorView.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorView.java
index 8fb536635630804908b240569e364c7eb7b11c28..a6f7e7aba7142e03615502236f168d3d7f8aaec5 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorView.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorView.java
@@ -23,7 +23,6 @@
 import org.chromium.base.TraceEvent;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
-import org.chromium.base.annotations.UsedByReflection;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.compositor.layouts.Layout;
 import org.chromium.chrome.browser.compositor.layouts.LayoutProvider;
@@ -40,14 +39,12 @@
 import org.chromium.ui.resources.AndroidResourceType;
 import org.chromium.ui.resources.ResourceManager;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * The is the {@link View} displaying the ui compositor results; including webpages and tabswitcher.
  */
 @JNINamespace("android")
-public class CompositorView extends SurfaceView implements SurfaceHolder.Callback2 {
+public class CompositorView
+        extends SurfaceView implements SurfaceHolder.Callback {
     private static final String TAG = "CompositorView";
     private static final long NANOSECONDS_PER_MILLISECOND = 1000000;
 
@@ -76,7 +73,6 @@
     private int mSurfaceWidth;
     private int mSurfaceHeight;
     private boolean mPreloadedResources;
-    private List<Runnable> mDrawingFinishedCallbacks;
 
     // The current SurfaceView pixel format. Defaults to OPAQUE.
     private int mCurrentPixelFormat = PixelFormat.OPAQUE;
@@ -204,9 +200,6 @@
 
         // Grab the Resource Manager
         mResourceManager = nativeGetResourceManager(mNativeCompositorView);
-
-        // Redraw in case there are callbacks pending |mDrawingFinishedCallbacks|.
-        nativeSetNeedsComposite(mNativeCompositorView);
     }
 
     @Override
@@ -222,19 +215,6 @@
         mCurrentPixelFormat = enabled ? PixelFormat.TRANSLUCENT : PixelFormat.OPAQUE;
         getHolder().setFormat(mCurrentPixelFormat);
         nativeSetOverlayVideoMode(mNativeCompositorView, enabled);
-    }
-
-    @Override
-    public void surfaceRedrawNeeded(SurfaceHolder holder) {
-        // Intentionally not implemented.
-    }
-
-    // TODO(boliu): Mark this override instead.
-    @UsedByReflection("Android")
-    public void surfaceRedrawNeededAsync(SurfaceHolder holder, Runnable drawingFinished) {
-        if (mDrawingFinishedCallbacks == null) mDrawingFinishedCallbacks = new ArrayList<>();
-        mDrawingFinishedCallbacks.add(drawingFinished);
-        if (mNativeCompositorView != 0) nativeSetNeedsComposite(mNativeCompositorView);
     }
 
     @Override
@@ -331,16 +311,6 @@
         mRenderHost.didSwapFrame(pendingFrameCount);
     }
 
-    @CalledByNative
-    private void didSwapBuffers() {
-        List<Runnable> runnables = mDrawingFinishedCallbacks;
-        mDrawingFinishedCallbacks = null;
-        if (runnables == null) return;
-        for (Runnable r : runnables) {
-            r.run();
-        }
-    }
-
     /**
      * Converts the layout into compositor layers. This is to be called on every frame the layout
      * is changing.