Chromium Code Reviews

Unified Diff: mojo/services/native_viewport/android/src/org/chromium/mojo/PlatformViewportAndroid.java

Issue 769173002: Move native_viewport and gles2 service impls to //services (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
« no previous file with comments | « mojo/services/native_viewport/DEPS ('k') | mojo/services/native_viewport/main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/native_viewport/android/src/org/chromium/mojo/PlatformViewportAndroid.java
diff --git a/mojo/services/native_viewport/android/src/org/chromium/mojo/PlatformViewportAndroid.java b/mojo/services/native_viewport/android/src/org/chromium/mojo/PlatformViewportAndroid.java
deleted file mode 100644
index 4a7d96e910ddec0ae41ca17923ffc67e31f13b3b..0000000000000000000000000000000000000000
--- a/mojo/services/native_viewport/android/src/org/chromium/mojo/PlatformViewportAndroid.java
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright 2013 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.mojo;
-
-import android.app.Activity;
-import android.content.Context;
-import android.view.MotionEvent;
-import android.view.Surface;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
-
-import org.chromium.base.CalledByNative;
-import org.chromium.base.JNINamespace;
-
-/**
- * Exposes SurfaceView to native code.
- */
-@JNINamespace("mojo")
-public class PlatformViewportAndroid extends SurfaceView {
-
- private long mNativeMojoViewport;
- private final SurfaceHolder.Callback mSurfaceCallback;
-
- @SuppressWarnings("unused")
- @CalledByNative
- public static void createForActivity(Activity activity, long nativeViewport) {
- activity.setContentView(new PlatformViewportAndroid(activity, nativeViewport));
- }
-
- public PlatformViewportAndroid(Context context, long nativeViewport) {
- super(context);
-
- mNativeMojoViewport = nativeViewport;
- assert mNativeMojoViewport != 0;
-
- mSurfaceCallback = new SurfaceHolder.Callback() {
- @Override
- public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
- assert mNativeMojoViewport != 0;
- nativeSurfaceSetSize(mNativeMojoViewport, width, height);
- }
-
- @Override
- public void surfaceCreated(SurfaceHolder holder) {
- assert mNativeMojoViewport != 0;
- nativeSurfaceCreated(mNativeMojoViewport, holder.getSurface());
- }
-
- @Override
- public void surfaceDestroyed(SurfaceHolder holder) {
- assert mNativeMojoViewport != 0;
- nativeSurfaceDestroyed(mNativeMojoViewport);
- }
- };
- getHolder().addCallback(mSurfaceCallback);
-
- }
-
- // TODO(abarth): Someone needs to call destroy at some point.
- public void destroy() {
- getHolder().removeCallback(mSurfaceCallback);
- nativeDestroy(mNativeMojoViewport);
- mNativeMojoViewport = 0;
- }
-
- @Override
- public boolean onTouchEvent(MotionEvent event) {
- return nativeTouchEvent(mNativeMojoViewport,
- event.getPointerId(0),
- event.getAction(),
- event.getX(), event.getY(),
- event.getEventTime());
- }
-
- private static native void nativeDestroy(long nativePlatformViewportAndroid);
- private static native void nativeSurfaceCreated(
- long nativePlatformViewportAndroid, Surface surface);
- private static native void nativeSurfaceDestroyed(
- long nativePlatformViewportAndroid);
- private static native void nativeSurfaceSetSize(
- long nativePlatformViewportAndroid,
- int width, int height);
- private static native boolean nativeTouchEvent(
- long nativePlatformViewportAndroid,
- int pointerId,
- int action,
- float x, float y,
- long timeMs);
-};
« no previous file with comments | « mojo/services/native_viewport/DEPS ('k') | mojo/services/native_viewport/main.cc » ('j') | no next file with comments »

Powered by Google App Engine