diff options
| author | Shimi Zhang <ctzsm@chromium.org> | 2022-02-24 22:57:20 +0000 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2022-02-24 15:13:42 -0800 |
| commit | 26faf883c1df28402eac3aac8c671e6120d2a509 (patch) | |
| tree | 493ad4cbb13c64f2c1dc9011259b658678c26097 /src/org/chromium/support_lib_boundary | |
| parent | f57d12f76f332a1060d17f6d5a528ee3fee1a8b5 (diff) | |
| download | webview_support_interfaces-26faf883c1df28402eac3aac8c671e6120d2a509.tar.gz | |
[JJI] Cleanup ScriptReferenceBoundaryInterface
There are actually other breaking changes in the boundary interfaces
directory from https://chromium-review.googlesource.com/c/chromium/src/+/3368924,
will address them separately before I roll the boundary interface
to AndroidX.
Bug: 918065
Test: 1. Compile and install WebView or use a default WebView.
Test: 2. Copy the change from Chromium to AndroidX
Test: 3. run ./gradlew :webkit:webkit:connectedAndroidTest
Test: 4. expecting no failures for both new/old version of WebView.
Change-Id: I0c56e7b45fe73aac68c70d952260388355c93280
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3485436
Reviewed-by: Nate Fischer <ntfschr@chromium.org>
Commit-Queue: Shimi Zhang <ctzsm@chromium.org>
Cr-Commit-Position: refs/heads/main@{#974884}
NOKEYCHECK=True
GitOrigin-RevId: 7d03027d415dd3c4248d4a3a140923f75531f560
Diffstat (limited to 'src/org/chromium/support_lib_boundary')
3 files changed, 4 insertions, 17 deletions
diff --git a/src/org/chromium/support_lib_boundary/ScriptHandlerBoundaryInterface.java b/src/org/chromium/support_lib_boundary/ScriptHandlerBoundaryInterface.java index 4dcaa75..0be98f8 100644 --- a/src/org/chromium/support_lib_boundary/ScriptHandlerBoundaryInterface.java +++ b/src/org/chromium/support_lib_boundary/ScriptHandlerBoundaryInterface.java @@ -7,4 +7,6 @@ package org.chromium.support_lib_boundary; /** * Boundary interface for AwContents.addDocumentStartJavascript(). */ -public interface ScriptHandlerBoundaryInterface extends ScriptReferenceBoundaryInterface {} +public interface ScriptHandlerBoundaryInterface { + void remove(); +} diff --git a/src/org/chromium/support_lib_boundary/ScriptReferenceBoundaryInterface.java b/src/org/chromium/support_lib_boundary/ScriptReferenceBoundaryInterface.java deleted file mode 100644 index aba822a..0000000 --- a/src/org/chromium/support_lib_boundary/ScriptReferenceBoundaryInterface.java +++ /dev/null @@ -1,15 +0,0 @@ -// 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(). - * - * 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/util/Features.java b/src/org/chromium/support_lib_boundary/util/Features.java index 238e343..2bebe65 100644 --- a/src/org/chromium/support_lib_boundary/util/Features.java +++ b/src/org/chromium/support_lib_boundary/util/Features.java @@ -184,7 +184,7 @@ 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"; + public static final String DOCUMENT_START_SCRIPT = "DOCUMENT_START_SCRIPT:1"; // WebSettingsCompat.setWebAuthnSupport // WebSettingsCompat.getWebAuthnSupport |