142 lines
6.3 KiB
Diff
142 lines
6.3 KiB
Diff
From: thermatk <thermatk@thermatk.com>
|
|
Date: Fri, 22 Jun 2018 17:04:43 +0200
|
|
Subject: kill Vision
|
|
|
|
Barcode, face and text detection APIs
|
|
---
|
|
chrome/android/BUILD.gn | 2 --
|
|
services/shape_detection/BUILD.gn | 6 ------
|
|
.../org/chromium/shape_detection/BitmapUtils.java | 12 ------------
|
|
.../shape_detection/FaceDetectionProviderImpl.java | 13 +------------
|
|
.../shape_detection/InterfaceRegistrar.java | 13 -------------
|
|
5 files changed, 1 insertion(+), 45 deletions(-)
|
|
|
|
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
|
--- a/chrome/android/BUILD.gn
|
|
+++ b/chrome/android/BUILD.gn
|
|
@@ -231,8 +231,6 @@ android_library("chrome_java") {
|
|
"$google_play_services_package:google_play_services_gcm_java",
|
|
"$google_play_services_package:google_play_services_iid_java",
|
|
"$google_play_services_package:google_play_services_tasks_java",
|
|
- "$google_play_services_package:google_play_services_vision_common_java",
|
|
- "$google_play_services_package:google_play_services_vision_java",
|
|
"//base:base_java",
|
|
"//base:jni_java",
|
|
"//chrome/android/features/keyboard_accessory:public_java",
|
|
diff --git a/services/shape_detection/BUILD.gn b/services/shape_detection/BUILD.gn
|
|
--- a/services/shape_detection/BUILD.gn
|
|
+++ b/services/shape_detection/BUILD.gn
|
|
@@ -84,14 +84,8 @@ if (is_android) {
|
|
|
|
android_library("shape_detection_java") {
|
|
sources = [
|
|
- "android/java/src/org/chromium/shape_detection/BarcodeDetectionImpl.java",
|
|
- "android/java/src/org/chromium/shape_detection/BarcodeDetectionProviderImpl.java",
|
|
"android/java/src/org/chromium/shape_detection/BitmapUtils.java",
|
|
- "android/java/src/org/chromium/shape_detection/FaceDetectionImpl.java",
|
|
- "android/java/src/org/chromium/shape_detection/FaceDetectionImplGmsCore.java",
|
|
- "android/java/src/org/chromium/shape_detection/FaceDetectionProviderImpl.java",
|
|
"android/java/src/org/chromium/shape_detection/InterfaceRegistrar.java",
|
|
- "android/java/src/org/chromium/shape_detection/TextDetectionImpl.java",
|
|
]
|
|
|
|
deps = [
|
|
diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detection/BitmapUtils.java b/services/shape_detection/android/java/src/org/chromium/shape_detection/BitmapUtils.java
|
|
--- a/services/shape_detection/android/java/src/org/chromium/shape_detection/BitmapUtils.java
|
|
+++ b/services/shape_detection/android/java/src/org/chromium/shape_detection/BitmapUtils.java
|
|
@@ -6,8 +6,6 @@ package org.chromium.shape_detection;
|
|
|
|
import android.graphics.Bitmap;
|
|
|
|
-import com.google.android.gms.vision.Frame;
|
|
-
|
|
import org.chromium.mojo_base.BigBufferUtil;
|
|
import org.chromium.skia.mojom.ColorType;
|
|
|
|
@@ -44,14 +42,4 @@ public class BitmapUtils {
|
|
|
|
return bitmap;
|
|
}
|
|
-
|
|
- public static Frame convertToFrame(org.chromium.skia.mojom.Bitmap bitmapData) {
|
|
- Bitmap bitmap = convertToBitmap(bitmapData);
|
|
- if (bitmap == null) {
|
|
- return null;
|
|
- }
|
|
-
|
|
- // This constructor implies a pixel format conversion to YUV.
|
|
- return new Frame.Builder().setBitmap(bitmap).build();
|
|
- }
|
|
}
|
|
diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionProviderImpl.java b/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionProviderImpl.java
|
|
--- a/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionProviderImpl.java
|
|
+++ b/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionProviderImpl.java
|
|
@@ -4,9 +4,6 @@
|
|
|
|
package org.chromium.shape_detection;
|
|
|
|
-import com.google.android.gms.common.ConnectionResult;
|
|
-import com.google.android.gms.common.GoogleApiAvailability;
|
|
-
|
|
import org.chromium.base.ContextUtils;
|
|
import org.chromium.mojo.bindings.InterfaceRequest;
|
|
import org.chromium.mojo.system.MojoException;
|
|
@@ -23,16 +20,8 @@ public class FaceDetectionProviderImpl implements FaceDetectionProvider {
|
|
@Override
|
|
public void createFaceDetection(
|
|
InterfaceRequest<FaceDetection> request, FaceDetectorOptions options) {
|
|
- final boolean isGmsCoreSupported =
|
|
- GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(
|
|
- ContextUtils.getApplicationContext())
|
|
- == ConnectionResult.SUCCESS;
|
|
|
|
- if (isGmsCoreSupported) {
|
|
- FaceDetection.MANAGER.bind(new FaceDetectionImplGmsCore(options), request);
|
|
- } else {
|
|
- FaceDetection.MANAGER.bind(new FaceDetectionImpl(options), request);
|
|
- }
|
|
+ FaceDetection.MANAGER.bind(new FaceDetectionImpl(options), request);
|
|
}
|
|
|
|
@Override
|
|
diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detection/InterfaceRegistrar.java b/services/shape_detection/android/java/src/org/chromium/shape_detection/InterfaceRegistrar.java
|
|
--- a/services/shape_detection/android/java/src/org/chromium/shape_detection/InterfaceRegistrar.java
|
|
+++ b/services/shape_detection/android/java/src/org/chromium/shape_detection/InterfaceRegistrar.java
|
|
@@ -8,9 +8,6 @@ import org.chromium.base.annotations.CalledByNative;
|
|
import org.chromium.base.annotations.JNINamespace;
|
|
import org.chromium.mojo.system.MessagePipeHandle;
|
|
import org.chromium.mojo.system.impl.CoreImpl;
|
|
-import org.chromium.shape_detection.mojom.BarcodeDetectionProvider;
|
|
-import org.chromium.shape_detection.mojom.FaceDetectionProvider;
|
|
-import org.chromium.shape_detection.mojom.TextDetection;
|
|
|
|
@JNINamespace("shape_detection")
|
|
class InterfaceRegistrar {
|
|
@@ -20,23 +17,13 @@ class InterfaceRegistrar {
|
|
|
|
@CalledByNative
|
|
static void bindBarcodeDetectionProvider(int nativeHandle) {
|
|
- BarcodeDetectionProvider impl = BarcodeDetectionProviderImpl.create();
|
|
- if (impl != null) {
|
|
- BarcodeDetectionProvider.MANAGER.bind(impl, messagePipeHandleFromNative(nativeHandle));
|
|
- }
|
|
}
|
|
|
|
@CalledByNative
|
|
static void bindFaceDetectionProvider(int nativeHandle) {
|
|
- FaceDetectionProvider.MANAGER.bind(
|
|
- new FaceDetectionProviderImpl(), messagePipeHandleFromNative(nativeHandle));
|
|
}
|
|
|
|
@CalledByNative
|
|
static void bindTextDetection(int nativeHandle) {
|
|
- TextDetection impl = TextDetectionImpl.create();
|
|
- if (impl != null) {
|
|
- TextDetection.MANAGER.bind(impl, messagePipeHandleFromNative(nativeHandle));
|
|
- }
|
|
}
|
|
}
|
|
--
|
|
2.17.1
|
|
|