Fix an issue that mediaplayer can return size(0,0) for a valid video

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

 // Copyright (c) 2012 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.content.browser;
 
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ skipping 92 matching lines @@
     private ContentVideoViewClient mClient;
 
     private class VideoSurfaceView extends SurfaceView {
 
         public VideoSurfaceView(Context context) {
             super(context);
         }
 
         @Override
         protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-            if (mVideoWidth == 0 && mVideoHeight == 0) {
-                setMeasuredDimension(1, 1);
-                return;
-            }
             int width = getDefaultSize(mVideoWidth, widthMeasureSpec);
             int height = getDefaultSize(mVideoHeight, heightMeasureSpec);
             if (mVideoWidth > 0 && mVideoHeight > 0) {
                 if ( mVideoWidth * height  > width * mVideoHeight ) {
                     height = width * mVideoHeight / mVideoWidth;
                 } else if ( mVideoWidth * height  < width * mVideoHeight ) {
                     width = height * mVideoWidth / mVideoHeight;
                 }
             }
             setMeasuredDimension(width, height);
@@ skipping 101 matching lines @@
         mErrorButton = context.getString(
                 org.chromium.content.R.string.media_player_error_button);
         mErrorTitle = context.getString(
                 org.chromium.content.R.string.media_player_error_title);
         mVideoLoadingText = context.getString(
                 org.chromium.content.R.string.media_player_loading_video);
     }
 
     private void showContentVideoView() {
         FrameLayout.LayoutParams layoutParams = new FrameLayout.LayoutParams(
-                ViewGroup.LayoutParams.WRAP_CONTENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT,
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.MATCH_PARENT,
                 Gravity.CENTER);
         this.addView(mVideoSurfaceView, layoutParams);
         View progressView = mClient.getVideoLoadingProgressView();
         if (progressView != null) {
             mProgressView = progressView;
         } else {
             mProgressView = new ProgressView(getContext(), mVideoLoadingText);
         }
-        this.addView(mProgressView, layoutParams);
+        this.addView(mProgressView, new FrameLayout.LayoutParams(
+                ViewGroup.LayoutParams.WRAP_CONTENT,
+                ViewGroup.LayoutParams.WRAP_CONTENT,
+                Gravity.CENTER));
         mVideoSurfaceView.setZOrderOnTop(true);
         mVideoSurfaceView.setOnKeyListener(this);
         mVideoSurfaceView.setOnTouchListener(this);
         mVideoSurfaceView.getHolder().addCallback(this);
         mVideoSurfaceView.setFocusable(true);
         mVideoSurfaceView.setFocusableInTouchMode(true);
         mVideoSurfaceView.requestFocus();
     }
 
     @CalledByNative
@@ skipping 43 matching lines @@
                 })
                 .setCancelable(false)
                 .show();
         }
     }
 
     @CalledByNative
     private void onVideoSizeChanged(int width, int height) {
         mVideoWidth = width;
         mVideoHeight = height;
-        if (mVideoWidth != 0 && mVideoHeight != 0) {
-            mVideoSurfaceView.getHolder().setFixedSize(mVideoWidth, mVideoHeight);
-        }
+        // This will trigger the SurfaceView.onMeasure() call.
+        mVideoSurfaceView.getHolder().setFixedSize(mVideoWidth, mVideoHeight);
     }
 
     @CalledByNative
     private void onBufferingUpdate(int percent) {
         mCurrentBufferPercentage = percent;
     }
 
     @CalledByNative
     private void onPlaybackComplete() {
         onCompletion();
@@ skipping 327 matching lines @@
     private native int nativeGetDurationInMilliSeconds(int nativeContentVideoView);
     private native void nativeUpdateMediaMetadata(int nativeContentVideoView);
     private native int nativeGetVideoWidth(int nativeContentVideoView);
     private native int nativeGetVideoHeight(int nativeContentVideoView);
     private native boolean nativeIsPlaying(int nativeContentVideoView);
     private native void nativePause(int nativeContentVideoView);
     private native void nativePlay(int nativeContentVideoView);
     private native void nativeSeekTo(int nativeContentVideoView, int msec);
     private native void nativeSetSurface(int nativeContentVideoView, Surface surface);
 }