| 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 d82af6097a94a99b1a808193f971ab6591712a24..10acd479683f8029ddef5c5070c1329b55d2d463 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
|
| @@ -2504,6 +2504,36 @@ public class AwSettingsTest extends AwTestBase {
|
| }
|
| }
|
|
|
| + @SmallTest
|
| + @Feature({"AndroidWebView", "Preferences"})
|
| + // background shorthand property must not override background-size when
|
| + // it's already set.
|
| + public void testUseLegacyBackgroundSizeShorthandBehavior() throws Throwable {
|
| + final TestAwContentsClient contentClient = new TestAwContentsClient();
|
| + final AwTestContainerView testContainerView =
|
| + createAwTestContainerViewOnMainSync(contentClient);
|
| + final AwContents awContents = testContainerView.getAwContents();
|
| + AwSettings settings = getAwSettingsOnUiThread(awContents);
|
| + CallbackHelper onPageFinishedHelper = contentClient.getOnPageFinishedHelper();
|
| + final String expectedBackgroundSize = "cover";
|
| + final String page = "<html><head>" +
|
| + "<script>" +
|
| + "function getBackgroundSize() {" +
|
| + " var e = document.getElementById('test'); " +
|
| + " e.style.backgroundSize = '" + expectedBackgroundSize + "';" +
|
| + " e.style.background = 'center red url(dummy://test.png) no-repeat border-box'; " +
|
| + " return e.style.backgroundSize; " +
|
| + "}" +
|
| + "</script></head>" +
|
| + "<body onload='document.title=getBackgroundSize()'>" +
|
| + " <div id='test'> </div>" +
|
| + "</body></html>";
|
| + settings.setJavaScriptEnabled(true);
|
| + loadDataSync(awContents, onPageFinishedHelper, page, "text/html", false);
|
| + String actualBackgroundSize = getTitleOnUiThread(awContents);
|
| + assertEquals(expectedBackgroundSize, actualBackgroundSize);
|
| + }
|
| +
|
| static class ViewPair {
|
| private final AwContents contents0;
|
| private final TestAwContentsClient client0;
|
|
|