Chromium Code Reviews Chromium Code Reviews
Issue 2257743002:
Restore user state on ReloadwithoutSubResourceCacheRevalidation (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master| Index: android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java |
| diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java |
| index ed6ca7182f7d40d918fb2ac9c65a145a6b3c0eae..162ef9ed28cd6d79de57f44fcc1deda538f42e8e 100644 |
| --- a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java |
| +++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java |
| @@ -1350,15 +1350,20 @@ public class AwSettingsTest extends AwTestBase { |
| } |
| private String getData() { |
| + // Add a sequence number as a comment to ensure WebView does not do |
| + // something special for the same page load, for instance, restoring |
| + // user state like a scroll position. |
| return "<html><head>" |
| + (mWithViewPortTag ? "<meta name='viewport' content='width=3000' />" : "") |
| - + "</head>" |
| - + "<body></body></html>"; |
| + + "</head><body><!-- " |
| + + mDataSequence++ |
| + + " --></body></html>"; |
| } |
| private final boolean mWithViewPortTag; |
| private boolean mExpectScaleChange; |
| private int mOnScaleChangedCallCount; |
| + private int mDataSequence; |
| } |
| class AwSettingsForceZeroLayoutHeightTestHelper extends AwSettingsTestHelper<Boolean> { |
| @@ -2653,6 +2658,7 @@ public class AwSettingsTest extends AwTestBase { |
| views.getContainer1(), views.getClient1())); |
| } |
| + // TODO(crbug.com/642636): This test does not work on Android M and laters. |
|
Takashi Toyoshima
2016/09/05 12:53:58
I'd remove this TODO in the next patch set because
|
| @SmallTest |
| @Feature({"AndroidWebView", "Preferences"}) |
| public void testLoadWithOverviewModeWithTwoViews() throws Throwable { |
| @@ -2664,6 +2670,7 @@ public class AwSettingsTest extends AwTestBase { |
| views.getContainer1(), views.getClient1(), false)); |
| } |
| + // TODO(crbug.com/642636): This test does not work on Android M and laters. |
| @SmallTest |
| @Feature({"AndroidWebView", "Preferences"}) |
| public void testLoadWithOverviewModeViewportTagWithTwoViews() throws Throwable { |
