diff options
author | Shimi Zhang <ctzsm@chromium.org> | 2021-03-17 20:32:31 +0000 |
---|---|---|
committer | Copybara-Service <copybara-worker@google.com> | 2021-03-17 13:37:05 -0700 |
commit | 24b3ad70385c0c5655af7ebd4af705512d1f949f (patch) | |
tree | c46cf5c8dcec47a62dc4b0e187a7e533f4ab5d2b | |
parent | bce01d5018c04b908e936b87318455d5ea795340 (diff) | |
download | webview_support_interfaces-24b3ad70385c0c5655af7ebd4af705512d1f949f.tar.gz |
[JJI] Rename ScriptReference to ScriptHandler
Per discussion from http://aosp/1635279, we rename the class name to
ScriptHandler.
We also drop the DOCUMENT_START_SCRIPT feature string's ":1" suffix
in this change.
Bug: 2761958
Test: the current tests should pass.
Change-Id: Ibeb413abc44e161132823fe99c1f462f45239414
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2765934
Reviewed-by: Nate Fischer <ntfschr@chromium.org>
Commit-Queue: Shimi Zhang <ctzsm@chromium.org>
Cr-Commit-Position: refs/heads/master@{#863942}
GitOrigin-RevId: 0794d233678d9a01c19b6446f7d26760e2290a11
5 files changed, 16 insertions, 2 deletions
@@ -12,6 +12,7 @@ android_library("boundary_interface_java") { "src/org/chromium/support_lib_boundary/JsReplyProxyBoundaryInterface.java", "src/org/chromium/support_lib_boundary/ProxyControllerBoundaryInterface.java", "src/org/chromium/support_lib_boundary/SafeBrowsingResponseBoundaryInterface.java", + "src/org/chromium/support_lib_boundary/ScriptHandlerBoundaryInterface.java", "src/org/chromium/support_lib_boundary/ScriptReferenceBoundaryInterface.java", "src/org/chromium/support_lib_boundary/ServiceWorkerClientBoundaryInterface.java", "src/org/chromium/support_lib_boundary/ServiceWorkerControllerBoundaryInterface.java", diff --git a/src/org/chromium/support_lib_boundary/ScriptHandlerBoundaryInterface.java b/src/org/chromium/support_lib_boundary/ScriptHandlerBoundaryInterface.java new file mode 100644 index 0000000..4dcaa75 --- /dev/null +++ b/src/org/chromium/support_lib_boundary/ScriptHandlerBoundaryInterface.java @@ -0,0 +1,10 @@ +// Copyright 2020 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.support_lib_boundary; + +/** + * Boundary interface for AwContents.addDocumentStartJavascript(). + */ +public interface ScriptHandlerBoundaryInterface extends ScriptReferenceBoundaryInterface {} diff --git a/src/org/chromium/support_lib_boundary/ScriptReferenceBoundaryInterface.java b/src/org/chromium/support_lib_boundary/ScriptReferenceBoundaryInterface.java index 6358e00..aba822a 100644 --- a/src/org/chromium/support_lib_boundary/ScriptReferenceBoundaryInterface.java +++ b/src/org/chromium/support_lib_boundary/ScriptReferenceBoundaryInterface.java @@ -6,6 +6,9 @@ package org.chromium.support_lib_boundary; /** * Boundary interface for AwContents.addDocumentStartJavascript(). + * + * TODO(ctzsm): Delete this interface once we've updated the APKs on + * the AndroidX bots and move the remove method to ScriptHandlerBoundaryInterface. */ public interface ScriptReferenceBoundaryInterface { void remove(); diff --git a/src/org/chromium/support_lib_boundary/WebViewProviderBoundaryInterface.java b/src/org/chromium/support_lib_boundary/WebViewProviderBoundaryInterface.java index 843d387..d524b31 100644 --- a/src/org/chromium/support_lib_boundary/WebViewProviderBoundaryInterface.java +++ b/src/org/chromium/support_lib_boundary/WebViewProviderBoundaryInterface.java @@ -20,7 +20,7 @@ public interface WebViewProviderBoundaryInterface { void addWebMessageListener(String jsObjectName, String[] allowedOriginRules, /* WebMessageListener */ InvocationHandler listener); void removeWebMessageListener(String jsObjectName); - /* ScriptReference */ InvocationHandler addDocumentStartJavaScript( + /* ScriptHandler */ InvocationHandler addDocumentStartJavaScript( String script, String[] allowedOriginRules); WebViewClient getWebViewClient(); WebChromeClient getWebChromeClient(); diff --git a/src/org/chromium/support_lib_boundary/util/Features.java b/src/org/chromium/support_lib_boundary/util/Features.java index b2f55e1..3038a4f 100644 --- a/src/org/chromium/support_lib_boundary/util/Features.java +++ b/src/org/chromium/support_lib_boundary/util/Features.java @@ -184,5 +184,5 @@ public class Features { public static final String SET_SUPPORT_LIBRARY_VERSION = "SET_SUPPORT_LIBRARY_VERSION"; // WebViewCompat.addDocumentStartJavascript - public static final String DOCUMENT_START_SCRIPT = "DOCUMENT_START_SCRIPT:1"; + public static final String DOCUMENT_START_SCRIPT = "DOCUMENT_START_SCRIPT"; } |