summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSayed Elabady <elabadysayed@google.com>2022-10-18 15:28:45 +0100
committerSayed Elabady <elabadysayed@google.com>2022-10-18 15:28:45 +0100
commit0b036b2ef020e38d85660bf14d39798b353effc9 (patch)
tree974017bd2e62f1dee6cffee493ddd5e2f5209747
parent98634f3066e0a839acac9d15ae01b317640d987d (diff)
parenta78ccba31957cbc6fe49106b45d96af824f7cec0 (diff)
downloadwebview_support_interfaces-0b036b2ef020e38d85660bf14d39798b353effc9.tar.gz
[AndroidX Webkit] roll boundary interfaces to a78ccba
This rolls the boundary interfaces for the androidx.webkit module to include the following commit range: https://android.googlesource.com/platform/external/webview_support_interfaces/+log/98634f3066e0a839acac9d15ae01b317640d987d..a78ccba31957cbc6fe49106b45d96af824f7cec0 Test: N/A Change-Id: I969b42d09ed4ffd6e88af0edcdef2757fbe1d598
-rw-r--r--BUILD.gn1
-rw-r--r--src/org/chromium/support_lib_boundary/DropDataContentProviderBoundaryInterface.java33
-rw-r--r--src/org/chromium/support_lib_boundary/ServiceWorkerWebSettingsBoundaryInterface.java8
-rw-r--r--src/org/chromium/support_lib_boundary/WebSettingsBoundaryInterface.java12
-rw-r--r--src/org/chromium/support_lib_boundary/WebViewProviderFactoryBoundaryInterface.java1
-rw-r--r--src/org/chromium/support_lib_boundary/util/Features.java11
6 files changed, 46 insertions, 20 deletions
diff --git a/BUILD.gn b/BUILD.gn
index e3dbf8d..43ae324 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -7,6 +7,7 @@ import("//build/config/android/rules.gni")
android_library("boundary_interface_java") {
sources = [
+ "src/org/chromium/support_lib_boundary/DropDataContentProviderBoundaryInterface.java",
"src/org/chromium/support_lib_boundary/FeatureFlagHolderBoundaryInterface.java",
"src/org/chromium/support_lib_boundary/IsomorphicObjectBoundaryInterface.java",
"src/org/chromium/support_lib_boundary/JsReplyProxyBoundaryInterface.java",
diff --git a/src/org/chromium/support_lib_boundary/DropDataContentProviderBoundaryInterface.java b/src/org/chromium/support_lib_boundary/DropDataContentProviderBoundaryInterface.java
new file mode 100644
index 0000000..9e694a2
--- /dev/null
+++ b/src/org/chromium/support_lib_boundary/DropDataContentProviderBoundaryInterface.java
@@ -0,0 +1,33 @@
+// Copyright 2022 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package org.chromium.support_lib_boundary;
+
+import android.content.ContentProvider;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.ParcelFileDescriptor;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.io.FileNotFoundException;
+
+/**
+ * Boundary interface for DropDataProvider.
+ */
+public interface DropDataContentProviderBoundaryInterface {
+ boolean onCreate();
+ String[] getStreamTypes(@NonNull Uri uri, @NonNull String mimeTypeFilter);
+ ParcelFileDescriptor openFile(@NonNull ContentProvider providerWrapper, @NonNull Uri uri)
+ throws FileNotFoundException;
+ Cursor query(@NonNull Uri uri, @Nullable String[] projection, @Nullable String selection,
+ @Nullable String[] selectionArgs, @Nullable String sortOrder);
+ String getType(@NonNull Uri uri);
+ Uri cache(byte[] imageBytes, String encodingFormat, String filename);
+ void setClearCachedDataIntervalMs(int milliseconds);
+ void onDragEnd(boolean imageInUse);
+ Bundle call(@NonNull String method, @Nullable String arg, @Nullable Bundle extras);
+} \ No newline at end of file
diff --git a/src/org/chromium/support_lib_boundary/ServiceWorkerWebSettingsBoundaryInterface.java b/src/org/chromium/support_lib_boundary/ServiceWorkerWebSettingsBoundaryInterface.java
index 5a4b9ab..f13f3a1 100644
--- a/src/org/chromium/support_lib_boundary/ServiceWorkerWebSettingsBoundaryInterface.java
+++ b/src/org/chromium/support_lib_boundary/ServiceWorkerWebSettingsBoundaryInterface.java
@@ -4,8 +4,6 @@
package org.chromium.support_lib_boundary;
-import org.chromium.support_lib_boundary.WebSettingsBoundaryInterface.RequestedWithHeaderMode;
-
import java.util.Set;
/**
@@ -28,12 +26,6 @@ public interface ServiceWorkerWebSettingsBoundaryInterface {
boolean getBlockNetworkLoads();
- @Deprecated
- void setRequestedWithHeaderMode(@RequestedWithHeaderMode int mode);
- @Deprecated
- @RequestedWithHeaderMode
- int getRequestedWithHeaderMode();
-
void setRequestedWithHeaderOriginAllowList(Set<String> allowedOriginRules);
Set<String> getRequestedWithHeaderOriginAllowList();
diff --git a/src/org/chromium/support_lib_boundary/WebSettingsBoundaryInterface.java b/src/org/chromium/support_lib_boundary/WebSettingsBoundaryInterface.java
index fa298a6..af22eb5 100644
--- a/src/org/chromium/support_lib_boundary/WebSettingsBoundaryInterface.java
+++ b/src/org/chromium/support_lib_boundary/WebSettingsBoundaryInterface.java
@@ -57,18 +57,6 @@ public interface WebSettingsBoundaryInterface {
@WebAuthnSupport
int getWebAuthnSupport();
- @Deprecated
- @Retention(RetentionPolicy.SOURCE)
- @interface RequestedWithHeaderMode {
- int NO_HEADER = 0;
- int APP_PACKAGE_NAME = 1;
- }
- @Deprecated
- void setRequestedWithHeaderMode(@RequestedWithHeaderMode int mode);
- @Deprecated
- @RequestedWithHeaderMode
- int getRequestedWithHeaderMode();
-
void setRequestedWithHeaderOriginAllowList(Set<String> allowedOriginRules);
Set<String> getRequestedWithHeaderOriginAllowList();
diff --git a/src/org/chromium/support_lib_boundary/WebViewProviderFactoryBoundaryInterface.java b/src/org/chromium/support_lib_boundary/WebViewProviderFactoryBoundaryInterface.java
index ef4ea8e..f7c7ef7 100644
--- a/src/org/chromium/support_lib_boundary/WebViewProviderFactoryBoundaryInterface.java
+++ b/src/org/chromium/support_lib_boundary/WebViewProviderFactoryBoundaryInterface.java
@@ -19,4 +19,5 @@ public interface WebViewProviderFactoryBoundaryInterface {
/* SupportLibraryTracingController */ InvocationHandler getTracingController();
/* SupportLibraryProxyController */ InvocationHandler getProxyController();
void setSupportLibraryVersion(String version);
+ /* DropDataContentProviderBoundaryInterface*/ InvocationHandler getDropDataProvider();
}
diff --git a/src/org/chromium/support_lib_boundary/util/Features.java b/src/org/chromium/support_lib_boundary/util/Features.java
index 2ddeece..990b16d 100644
--- a/src/org/chromium/support_lib_boundary/util/Features.java
+++ b/src/org/chromium/support_lib_boundary/util/Features.java
@@ -227,4 +227,15 @@ public class Features {
// CookieManagerCompat.getCookieInfo
public static final String GET_COOKIE_INFO = "GET_COOKIE_INFO";
+
+ // DropDataContentProvider.onCreate
+ // DropDataContentProvider.getStreamTypes
+ // DropDataContentProvider.openFile
+ // DropDataContentProvider.query
+ // DropDataContentProvider.getType
+ // DropDataContentProvider.cache
+ // DropDataContentProvider.setClearCachedDataIntervalMs
+ // DropDataContentProvider.onDragEnd
+ // DropDataContentProvider.call
+ public static final String IMAGE_DRAG_DROP = "IMAGE_DRAG_DROP";
}