Android: small fix for external video surface on 64-bit.

BUG=346626, 354405

Review URL: https://codereview.chromium.org/268653002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267552 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 6 insertions, 6 deletions

diff --git a/android_webview/java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java b/android_webview/java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java
index 985fc42..7de5e3c 100644
--- a/android_webview/java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java
+++ b/android_webview/java/src/org/chromium/android_webview/ExternalVideoSurfaceContainer.java
@@ -63,7 +63,7 @@ public class ExternalVideoSurfaceContainer implements SurfaceHolder.Callback {
     private static WeakReference<ExternalVideoSurfaceContainer> sActiveContainer =
             new WeakReference<ExternalVideoSurfaceContainer>(null);
 
-    private final int mNativeExternalVideoSurfaceContainer;
+    private final long mNativeExternalVideoSurfaceContainer;
     private final ContentViewCore mContentViewCore;
     private int mPlayerId = INVALID_PLAYER_ID;
     private SurfaceView mSurfaceView;
@@ -85,7 +85,7 @@ public class ExternalVideoSurfaceContainer implements SurfaceHolder.Callback {
      */
     public static class Factory {
         public ExternalVideoSurfaceContainer create(
-                int nativeExternalVideoSurfaceContainer, ContentViewCore contentViewCore) {
+                long nativeExternalVideoSurfaceContainer, ContentViewCore contentViewCore) {
             return new ExternalVideoSurfaceContainer(
                     nativeExternalVideoSurfaceContainer, contentViewCore);
         }
@@ -99,12 +99,12 @@ public class ExternalVideoSurfaceContainer implements SurfaceHolder.Callback {
 
     @CalledByNative
     private static ExternalVideoSurfaceContainer create(
-            int nativeExternalVideoSurfaceContainer, ContentViewCore contentViewCore) {
+            long nativeExternalVideoSurfaceContainer, ContentViewCore contentViewCore) {
         return sFactory.create(nativeExternalVideoSurfaceContainer, contentViewCore);
     }
 
     protected ExternalVideoSurfaceContainer(
-            int nativeExternalVideoSurfaceContainer, ContentViewCore contentViewCore) {
+            long nativeExternalVideoSurfaceContainer, ContentViewCore contentViewCore) {
         assert contentViewCore != null;
         mNativeExternalVideoSurfaceContainer = nativeExternalVideoSurfaceContainer;
         mContentViewCore = contentViewCore;
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/ExternalVideoSurfaceContainerTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/ExternalVideoSurfaceContainerTest.java
index ca4df0c..85fae9a 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/ExternalVideoSurfaceContainerTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/ExternalVideoSurfaceContainerTest.java
@@ -55,7 +55,7 @@ public class ExternalVideoSurfaceContainerTest extends AwTestBase {
         private int mPlayerId = INVALID_PLAYER_ID;
 
         public MockExternalVideoSurfaceContainer(
-                int nativeExternalVideoSurfaceContainer, ContentViewCore contentViewCore) {
+                long nativeExternalVideoSurfaceContainer, ContentViewCore contentViewCore) {
             super(nativeExternalVideoSurfaceContainer, contentViewCore);
         }
 
@@ -91,7 +91,7 @@ public class ExternalVideoSurfaceContainerTest extends AwTestBase {
         ExternalVideoSurfaceContainer.setFactory(new ExternalVideoSurfaceContainer.Factory() {
             @Override
             public ExternalVideoSurfaceContainer create(
-                    int nativeContainer, ContentViewCore contentViewCore) {
+                    long nativeContainer, ContentViewCore contentViewCore) {
                 return new MockExternalVideoSurfaceContainer(nativeContainer, contentViewCore);
             }
         });