[Android] Only initialize ContentReadbackHandler in onNativeLibraryLo…

…aded for TextureView.

Let's bail out after ContentReadbackHandler initialization in the case of
TextureView.

BUG=https://crosswalk-project.org/jira/browse/XWALK-1887

Reworked with M38.

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

@@ -173,11 +173,23 @@ public ContentViewRenderView(Context context, CompositingSurfaceType surfaceType
      * @param rootWindow The {@link WindowAndroid} this render view should be linked to.
      */
     public void onNativeLibraryLoaded(WindowAndroid rootWindow) {
-        assert !mSurfaceView.getHolder().getSurface().isValid() :
-                "Surface created before native library loaded.";
         assert rootWindow != null;
         mNativeContentViewRenderView = nativeInit(rootWindow.getNativePointer());
         assert mNativeContentViewRenderView != 0;
+
+        mContentReadbackHandler = new ContentReadbackHandler() {
+            @Override
+            protected boolean readyForReadback() {
+                return mNativeContentViewRenderView != 0 && mContentViewCore != null;
+            }
+        };
+        mContentReadbackHandler.initNativeContentReadbackHandler();
+
+        if (mCompositingSurfaceType == CompositingSurfaceType.TEXTURE_VIEW)
+            return;
+
+        assert !mSurfaceView.getHolder().getSurface().isValid() :
+                "Surface created before native library loaded.";
         mSurfaceCallback = new SurfaceHolder.Callback() {
             @Override
             public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
@@ -206,14 +218,6 @@ public void surfaceDestroyed(SurfaceHolder holder) {
         };
         mSurfaceView.getHolder().addCallback(mSurfaceCallback);
         mSurfaceView.setVisibility(VISIBLE);
-
-        mContentReadbackHandler = new ContentReadbackHandler() {
-            @Override
-            protected boolean readyForReadback() {
-                return mNativeContentViewRenderView != 0 && mContentViewCore != null;
-            }
-        };
-        mContentReadbackHandler.initNativeContentReadbackHandler();
     }
 
     /**