Commit 6cc0e7a1 authored by Mugdha Lakhani's avatar Mugdha Lakhani Committed by Commit Bot

[WebLayer] Support prerender API starting M87

Per code review feedback here:
https://chromium-review.googlesource.com/c/chromium/src/+/2470634/comment/fee3ad23_a4607e7f/

the API was introduced for M88 first.
Once the API implementation has been cherry-picked to M87, this change
will land, supporting it M87 onwards.

Bug: 1136091
Change-Id: I9544c97faf807b5c59e9d4113768804e0fad96d5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2489999
Commit-Queue: Mugdha Lakhani <nator@chromium.org>
Reviewed-by: default avatarScott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#820866}
parent 1bf33d63
...@@ -53,7 +53,7 @@ public class PrerenderControllerTest { ...@@ -53,7 +53,7 @@ public class PrerenderControllerTest {
@Test @Test
@SmallTest @SmallTest
@Feature({"WebLayer"}) @Feature({"WebLayer"})
@MinWebLayerVersion(88) @MinWebLayerVersion(87)
public void testAddingPrerender() throws Exception { public void testAddingPrerender() throws Exception {
TestWebServer testServer = TestWebServer.start(); TestWebServer testServer = TestWebServer.start();
testServer.setRequestHandler(mRequestHandler); testServer.setRequestHandler(mRequestHandler);
......
...@@ -5,6 +5,6 @@ ...@@ -5,6 +5,6 @@
package org.chromium.weblayer_private.interfaces; package org.chromium.weblayer_private.interfaces;
interface IPrerenderController { interface IPrerenderController {
// Since 88 // Since 87
void prerender(in String url) = 0; void prerender(in String url) = 0;
} }
...@@ -45,7 +45,5 @@ interface IProfile { ...@@ -45,7 +45,5 @@ interface IProfile {
// Added in Version 87. // Added in Version 87.
void setUserIdentityCallbackClient(IUserIdentityCallbackClient client) = 13; void setUserIdentityCallbackClient(IUserIdentityCallbackClient client) = 13;
// Added in Version 88.
IPrerenderController getPrerenderController() = 15; IPrerenderController getPrerenderController() = 15;
} }
...@@ -21,7 +21,7 @@ import org.chromium.weblayer_private.interfaces.IProfile; ...@@ -21,7 +21,7 @@ import org.chromium.weblayer_private.interfaces.IProfile;
* not execute Javascript or render any part of the page in advance. For more information on * not execute Javascript or render any part of the page in advance. For more information on
* NoStatePrefetch, see https://developers.google.com/web/updates/2018/07/nostate-prefetch. * NoStatePrefetch, see https://developers.google.com/web/updates/2018/07/nostate-prefetch.
* *
* @since 88 * @since 87
*/ */
public class PrerenderController { public class PrerenderController {
private final IPrerenderController mImpl; private final IPrerenderController mImpl;
......
...@@ -80,7 +80,7 @@ public class Profile { ...@@ -80,7 +80,7 @@ public class Profile {
mName = name; mName = name;
mImpl = impl; mImpl = impl;
mCookieManager = CookieManager.create(impl); mCookieManager = CookieManager.create(impl);
if (WebLayer.getSupportedMajorVersionInternal() >= 88) { if (WebLayer.getSupportedMajorVersionInternal() >= 87) {
mPrerenderController = PrerenderController.create(impl); mPrerenderController = PrerenderController.create(impl);
} else { } else {
mPrerenderController = null; mPrerenderController = null;
...@@ -208,11 +208,11 @@ public class Profile { ...@@ -208,11 +208,11 @@ public class Profile {
/** /**
* Gets the prerender controller for this profile. * Gets the prerender controller for this profile.
* *
* @since 88 * @since 87
*/ */
@NonNull @NonNull
public PrerenderController getPrerenderController() { public PrerenderController getPrerenderController() {
if (WebLayer.getSupportedMajorVersionInternal() < 88) { if (WebLayer.getSupportedMajorVersionInternal() < 87) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment