Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / content / public / android / java / src / org / chromium / content / browser / ContentVideoView.java

diff --git a/src/content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java b/src/content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java
index 557d63e..0751073 100644 (file)
--- a/src/content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java
+++ b/src/content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java
@@ -99,9 +99,13 @@ public class ContentVideoView extends FrameLayout
 
         @Override
         protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-            int width = getDefaultSize(mVideoWidth, widthMeasureSpec);
-            int height = getDefaultSize(mVideoHeight, heightMeasureSpec);
+            // set the default surface view size to (1, 1) so that it won't block
+            // the infobar. (0, 0) is not a valid size for surface view.
+            int width = 1;
+            int height = 1;
             if (mVideoWidth > 0 && mVideoHeight > 0) {
+                width = getDefaultSize(mVideoWidth, widthMeasureSpec);
+                height = getDefaultSize(mVideoHeight, heightMeasureSpec);
                 if (mVideoWidth * height  > width * mVideoHeight) {
                     height = width * mVideoHeight / mVideoWidth;
                 } else if (mVideoWidth * height  < width * mVideoHeight) {
@@ -171,8 +175,8 @@ public class ContentVideoView extends FrameLayout
     protected void showContentVideoView() {
         mVideoSurfaceView.getHolder().addCallback(this);
         this.addView(mVideoSurfaceView, new FrameLayout.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.WRAP_CONTENT,
+                ViewGroup.LayoutParams.WRAP_CONTENT,
                 Gravity.CENTER));
 
         mProgressView = mClient.getVideoLoadingProgressView();
@@ -362,7 +366,7 @@ public class ContentVideoView extends FrameLayout
         }
     }
 
-    protected boolean isPlaying() {
+    public boolean isPlaying() {
         return mNativeContentVideoView != 0 && nativeIsPlaying(mNativeContentVideoView);
     }