commit 2bb4bf67759257ce2d30801c7dafd4b4fccd42b0
author Shimi Zhang <ctzsm@chromium.org> Thu Jun 11 21:22:06 2020
committer Commit Bot <commit-bot@chromium.org> Thu Jun 11 21:22:06 2020
tree ac2bf11aeed3f5bad761ea10b637f706120650a8
parent 818444f5c610852a11fd3c03e5c01f703dae60b0

[WebView] Rename to DocumentStartJavaScript

Per Java style guide https://google.github.io/styleguide/javaguide.html#s5.3-camel-case,
Javascript is better to be JavaScript.

We will need to do a 3-way patching for the AndroidX boundary interface,
so adding the addDocumentStartJavaScript() first in this CL, we need to
remove the original addDocumentStartJavascript() after aosp/1329732
landed.

We also upgrade the feature version to avoiding old AndroidX calling
newer WebView or vice versa.

Bug: 918065
Test: Covered by existing tests
Change-Id: I1f5eee713d521ac5f480eee670f5f5be674de553
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2240283
Reviewed-by: Richard Coles <torne@chromium.org>
Reviewed-by: Changwan Ryu <changwan@chromium.org>
Reviewed-by: Robert Sesek <rsesek@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Shimi Zhang <ctzsm@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#777493}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: cfdcb6f24a423de1d179d2432fcd0144b4d39df7

src/org/chromium/support_lib_boundary/WebViewProviderBoundaryInterface.java

diff --git a/src/org/chromium/support_lib_boundary/WebViewProviderBoundaryInterface.java b/src/org/chromium/support_lib_boundary/WebViewProviderBoundaryInterface.java
index 0883d53..b1d409b 100644
--- a/src/org/chromium/support_lib_boundary/WebViewProviderBoundaryInterface.java
+++ b/src/org/chromium/support_lib_boundary/WebViewProviderBoundaryInterface.java
@@ -20,8 +20,11 @@
     void addWebMessageListener(String jsObjectName, String[] allowedOriginRules,
             /* WebMessageListener */ InvocationHandler listener);
     void removeWebMessageListener(String jsObjectName);
+    // TODO(ctzsm): Remove the following interface after AndroidX patch landed.
     /* ScriptReference */ InvocationHandler addDocumentStartJavascript(
             String script, String[] allowedOriginRules);
+    /* ScriptReference */ InvocationHandler addDocumentStartJavaScript(
+            String script, String[] allowedOriginRules);
     WebViewClient getWebViewClient();
     WebChromeClient getWebChromeClient();
     /* WebViewRenderer */ InvocationHandler getWebViewRenderer();

src/org/chromium/support_lib_boundary/util/Features.java

diff --git a/src/org/chromium/support_lib_boundary/util/Features.java b/src/org/chromium/support_lib_boundary/util/Features.java
index 6958546..0f285cc 100644
--- a/src/org/chromium/support_lib_boundary/util/Features.java
+++ b/src/org/chromium/support_lib_boundary/util/Features.java
@@ -178,5 +178,5 @@
     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";
 }